aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-08-19 02:39:10 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-08-19 02:39:10 +0000
commit8bd6e0470075ccd1082fda4dfef32316f4197a94 (patch)
treeeb74efd4fa267c381c89b8987fc3b70531b529d2
parent587aac115086809e63d8b1872a9a9e1723222aa7 (diff)
parente58ddb1f506cc4686e69c454ba1d0cc2fc767b2e (diff)
downloadcommon-android12-d1-s1-release.tar.gz
Merge cherrypicks of [15619363, 15619364, 15619365, 15619399, 15619400, 15619401, 15619366, 15619367, 15619368, 15619369, 15619424, 15619425, 15619426, 15619427, 15619428, 15619402, 15619403, 15619404, 15619370, 15619371, 15619372, 15619373, 15618427, 15619429, 15619405, 15619406, 15619407, 15619408, 15619374, 15619375, 15619409] into sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-release
Change-Id: I4bb20574965a3f5c324bba0d4cecc2b03963c4fe
-rw-r--r--build/allowed_deps.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt
index 6f3f0f29..a49a679d 100644
--- a/build/allowed_deps.txt
+++ b/build/allowed_deps.txt
@@ -694,6 +694,7 @@ resourceobserver_aidl_interface-V1-ndk_platform(minSdkVersion:29)
server_configurable_flags(minSdkVersion:29)
ServiceWifiResourcesGoogle(minSdkVersion:30)
SettingsLibActionBarShadow(minSdkVersion:21)
+SettingsLibActionBarShadow(minSdkVersion:28)
SettingsLibAppPreference(minSdkVersion:21)
SettingsLibBarChartPreference(minSdkVersion:21)
SettingsLibCollapsingToolbarBaseActivity(minSdkVersion:29)