tree f4227faf1f6c0a37a6506c185ca34eeee8ffc7a0
parent e61bd38e63961013c70a3157bc582f7def805e99
parent 217d07615e14335a54eeee5fb4478f4125487514
author Treehugger Robot <treehugger-gerrit@google.com> 1587772154 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1587772154 +0000

Merge "Add license type: ISC+BSD+MIT+OpenSSL+zlib+Apache2" am: 217d07615e

Change-Id: I1fcfb721f80e7539c84603759a3a128be38a4d26