summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorCollin Fijalkovich <cfijalkovich@google.com>2021-10-13 13:37:13 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-13 13:37:13 +0000
commit7815edd7e8c8709b20be288a39ed9bea08165736 (patch)
tree3c7f3e4ec7ea454819b5e087141a36cfbc6b436d /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf34f93b815e319c951f575f3242eab944e56da5f (diff)
parent80a149a827b99e776ed8dddc0886227be47baf1a (diff)
[automerger skipped] Disallow overlays for ResolverActivity am: 978809e428 -s ours am: 893ce3e09c -s ours am: 80a149a827 -s ours
am skip reason: Merged-In Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674 with SHA-1 718c60bea7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960136 Change-Id: I4d342013155abaf23659660002d318adb139d144
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions