diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-04 21:50:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-04 21:50:12 +0000 |
commit | a96e494136bc38f22a66c5964859999bbf884fb3 (patch) | |
tree | 39bc4e253d946a671dacd5e49a19786d7b08e646 /MODULE_LICENSE_APACHE2 | |
parent | 98ac85aed11c6d611f132e5ef46d85c413619ffb (diff) | |
parent | 759defa9aa422576b7b9c041f6e41c86ac8db4d5 (diff) | |
download | protobuf-a96e494136bc38f22a66c5964859999bbf884fb3.tar.gz |
Merge "Fix license_type. Contains GPL" am: 759defa9aa
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1573263
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4783867fa779006a0a50caf95af12c62246cdd33
Diffstat (limited to 'MODULE_LICENSE_APACHE2')
0 files changed, 0 insertions, 0 deletions