summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorWinson Chiu <chiuwinson@google.com>2020-12-08 00:53:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-08 00:53:20 +0000
commit530654b082cc38c41b6337795e6befbf610aa1b7 (patch)
tree9a5fbc2ee2b6dadf724edaf3e54f2e5828a24443 /tools/aapt2/java/JavaClassGenerator.cpp
parenta92820b434cf99ce62bc5dbfcd505547de44e874 (diff)
parent8f769e1796f2fbe9878b3948b8f9e32898b92cdd (diff)
[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into pi-dev am: 4837c8a971 -s ours am: 69eed6d337 -s ours am: 8f769e1796 -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: Ia9045e88b1bd30561861d62c36194efb23598de1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions