summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-14 00:49:51 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-14 00:49:51 +0000
commit8c8357e694859b3656630e11e993d966bcffea25 (patch)
tree5df9750c95e55f021fa0f96fc93f6a97e820a009 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentbf15433b7bd9c53a2863e306e3fe1114b98fb6c3 (diff)
parent0910c83732f4d72c885a03068e23bb44298742a0 (diff)
Merge "Merge "Skip carrier priv check for trusted UIDs" into rvc-dev am: f1a6972937 am: a9d9ea8a3e am: 93b9040fcb" into rvc-qpr-dev-plus-aosp am: 0910c83732
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12141306 Change-Id: Ibc791d38922df4b1ea3b6c440e9025bc9c6d14f3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions