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