summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorWinson Chiu <chiuwinson@google.com>2020-12-08 00:52:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-08 00:52:31 +0000
commit8f769e1796f2fbe9878b3948b8f9e32898b92cdd (patch)
tree1d87ef7407e8e39eb178f7045d5d2076f3b53dec /tools/aapt2/java/JavaClassGenerator.cpp
parentfb6579ab0eaaed7dc26387d8550b6b5249713dec (diff)
parent69eed6d3378b6b60f2894425f99cf4dd4daeae2b (diff)
[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into pi-dev am: 4837c8a971 -s ours am: 69eed6d337 -s ours
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 ebb4d67258 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12940360 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I473aa8d1fe4791d9311ed732b6ffcc070f773e89
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions