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