diff options
author | Jack He <siyuanh@google.com> | 2020-04-20 17:13:51 -0700 |
---|---|---|
committer | Jack He <siyuanh@google.com> | 2020-04-21 13:31:50 -0700 |
commit | 22f554e9e49ea1ceea77fa97ec39f3dfe0fdd44a (patch) | |
tree | eccb3e4c6ec162116d2f00d984d57335114756a0 /MODULE_LICENSE_BSD | |
parent | 05728773737deb58a10cdbe29750152c13e400bf (diff) | |
parent | a2d3e8b2d5f8f3de06eefec50566c9a54d7cf0a6 (diff) | |
download | google-breakpad-22f554e9e49ea1ceea77fa97ec39f3dfe0fdd44a.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into merge-from-upstream-20190420
* Fixed build for host
* Added required METADATA and MODULE_LICENSE_BSD files
Bug: 154443614
Test: mm -j40
Change-Id: I5f9bb7b9ac14170b7e44e3b3dcfb4c37619fbd15
Diffstat (limited to 'MODULE_LICENSE_BSD')
-rw-r--r-- | MODULE_LICENSE_BSD | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/MODULE_LICENSE_BSD b/MODULE_LICENSE_BSD new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/MODULE_LICENSE_BSD |