[automerger skipped] Drop TrustCor certificates am: 7f21eeb5f6 am: f66c1b62fa am: 287ab50b84 am: dc882e91a3 -s ours am: f4cfb15aac -s ours
am skip reason: Merged-In Id951f8710aff9f9a907f4fc56035533eb6f6b760 with SHA-1 cbc6bbaa09 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/ca-certificates/+/22944915
Change-Id: I90b356842d1f13bf8ea42cc85e1ee0e3923f7299
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/Android.bp b/Android.bp
index 604fd07..9ba26a3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -19,7 +19,6 @@
default_applicable_licenses: ["system_ca-certificates_license"],
}
-// Added automatically by a large-scale-change
// See: http://go/android-license-faq
license {
name: "system_ca-certificates_license",
@@ -27,7 +26,7 @@
license_kinds: [
"legacy_by_exception_only", // by exception only
],
- // large-scale-change unable to identify any license_text files
+ license_text: [],
}
ca_certificates {
diff --git a/METADATA b/METADATA
index 598c1ea..b7a7487 100644
--- a/METADATA
+++ b/METADATA
@@ -2,7 +2,7 @@
# CONSULT THE OWNERS AND [email protected] BEFORE
# DEPENDING ON IT IN YOUR PROJECT. ***
third_party {
- # Quo Vadis Certificate Policy in files/5cf9d536.0 references:
- # Quo Vadis Certificate Holder Agreement
+ license_note: "Quo Vadis Certificate Policy in files/5cf9d536.0 references:\n"
+ " Quo Vadis Certificate Holder Agreement"
license_type: BY_EXCEPTION_ONLY
}
