summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorWinson Chiu <chiuwinson@google.com>2020-12-08 02:27:17 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-08 02:27:17 +0000
commit321aaa6e4112bea58914021b166ee97ba0ed6a6b (patch)
tree07a268d71c4fd05017a9d2cae47c31e5272085a5 /tools/aapt2/java/JavaClassGenerator.cpp
parent4f4568795c5612abb6465c12aac5421a97d8d35c (diff)
parentb8cf8bdb03e9226ab27a626294aacab32b06075f (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 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: I9aa4e82efcc54ad85ff8cc4253baf34e8d7b12d1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions