aboutsummaryrefslogtreecommitdiff
path: root/METADATA
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-02-04 22:15:29 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-04 22:15:29 +0000
commitcfb573f73df78e7ee3263b79df36ff863b37cc7d (patch)
tree39bc4e253d946a671dacd5e49a19786d7b08e646 /METADATA
parent3b0264b34bbd911179a1b8b3d12ff2efa6cf82b2 (diff)
parenta96e494136bc38f22a66c5964859999bbf884fb3 (diff)
downloadprotobuf-cfb573f73df78e7ee3263b79df36ff863b37cc7d.tar.gz
Merge "Fix license_type. Contains GPL" am: 759defa9aa am: a96e494136
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1573263 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I83a8fa8734f713340c7b3023d19b3e3be9d9e897
Diffstat (limited to 'METADATA')
-rw-r--r--METADATA3
1 files changed, 2 insertions, 1 deletions
diff --git a/METADATA b/METADATA
index c1c4110ea..eb67a96c7 100644
--- a/METADATA
+++ b/METADATA
@@ -14,5 +14,6 @@ third_party {
# Also update the suffix in Android.bp when updating the version.
version: "v3.9.1"
last_upgrade_date { year: 2019 month: 8 day: 23 }
- license_type: NOTICE
+ # would be NOTICE save for GPL in java/core/src/stubs/sun/misc/Unsafe.java
+ license_type: RESTRICTED
}