aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaeid Farivar Asanjan <farivar@google.com>2023-01-19 20:45:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2023-01-19 20:45:41 +0000
commit3360760531e042d83b82643769af8dc2e464fe8e (patch)
treeb1d788843de8791b66763a8643e486df37520cc8
parent892d2fd80d620f75c820115fc42d4078f87d6ca5 (diff)
parentec62d6521e76544cb14cc1fa2d5fe5e4fb509dc7 (diff)
downloadcommon-3360760531e042d83b82643769af8dc2e464fe8e.tar.gz
Merge "Ignore-AOSP-First: merge conflict. see aosp/2364085" into tm-qpr-dev
-rw-r--r--build/allowed_deps.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt
index 2556f6a8..4cfa8cee 100644
--- a/build/allowed_deps.txt
+++ b/build/allowed_deps.txt
@@ -211,8 +211,10 @@ captiveportal-lib(minSdkVersion:29)
car-rotary-lib(minSdkVersion:28)
car-rotary-lib-resources(minSdkVersion:28)
car-ui-lib(minSdkVersion:28)
+car-ui-lib-overlayable-resources(minSdkVersion:28)
car-ui-lib-resources(minSdkVersion:28)
car-ui-lib-source(minSdkVersion:28)
+car-ui-lib-source-no-overlayable(minSdkVersion:28)
census(minSdkVersion:30)
clatd(minSdkVersion:30)
codecs_g711dec(minSdkVersion:29)