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:33:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-14 00:33:14 +0000
commit0910c83732f4d72c885a03068e23bb44298742a0 (patch)
tree00f91b1148ef7ebc0fa7539b41c3a4d28d3dc9b0 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent618b075f8d480372ad6624ed08dd22e9b5337bb9 (diff)
parenta8e61abd626d010112da2594d24fb7105233881b (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
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions