summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorWinson Chiu <chiuwinson@google.com>2020-12-08 04:27:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-08 04:27:37 +0000
commit95251a1b76cbf3f4708e24a7b10184b5040ea090 (patch)
treeff79063cf1def7798fd4c72105ca54c674e95601 /tools/aapt2/java/JavaClassGenerator.cpp
parentb53a4559f79a8da929fe756d2a984440165bb3ed (diff)
parentd5b3480c710a707f536be493b0dc80db0291de77 (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: 8a7fc10c89 -s ours am: d5b3480c71 -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: Icf77f8f5d798cf23bdaa935b1737e4f327e1756c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions