| commit | 371bed02c61d1acc84bdfad2b9297957b20d11a5 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Apr 25 00:36:44 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Apr 25 00:36:44 2020 +0000 |
| tree | f4227faf1f6c0a37a6506c185ca34eeee8ffc7a0 | |
| parent | f3071b3f0c7fbc8aaafe0f1d6efc05c12acd5b23 [diff] | |
| parent | 6a396daf775b2bd6089e205679d236c1dde15001 [diff] |
Merge "Add license type: ISC+BSD+MIT+OpenSSL+zlib+Apache2" am: 217d07615e am: 1277ffb01b am: 710432084d am: 6a396daf77 Change-Id: I7cf6206fffe546ec2f25e347fa17ac954e5b687e