summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/AnnotationProcessor_test.cpp
diff options
context:
space:
mode:
authorWinson Chiu <chiuwinson@google.com>2020-12-08 02:57:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-08 02:57:04 +0000
commit8a7fc10c89a4a11473623ff904ad68c4b4018ea9 (patch)
tree1d87ef7407e8e39eb178f7045d5d2076f3b53dec /tools/aapt2/java/AnnotationProcessor_test.cpp
parentc141682801fbeb003f5fe3c91da274cb0f9f4be2 (diff)
parent321aaa6e4112bea58914021b166ee97ba0ed6a6b (diff)
[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-dev am: e9954e149f am: b070447e39 -s ours am: 2d22fe6eec -s ours am: b8cf8bdb03 -s ours am: 321aaa6e41 -s ours
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 4e71b31e0c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12940358 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iab2caf4b5ad01179f5a9c458429a91403e4ea703
Diffstat (limited to 'tools/aapt2/java/AnnotationProcessor_test.cpp')
0 files changed, 0 insertions, 0 deletions