diff options
| author | Winson Chiu <chiuwinson@google.com> | 2020-12-08 01:10:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 01:10:15 +0000 |
| commit | 204ae74cc1a42505154e6019ea9783322a744e7c (patch) | |
| tree | d35e61c24159de7b637a231d575953430ea5f80c /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 1c80119affdaccb53b0b7bc75937fe979eab3f0e (diff) | |
| parent | b53a4559f79a8da929fe756d2a984440165bb3ed (diff) | |
[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-mr1-dev am: 9109ce178e -s ours am: b2dd5af43b -s ours am: 4f4568795c -s ours am: c141682801 -s ours am: 31ba467a83 -s ours am: b53a4559f7 -s ours
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 2b1ed5b779 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12940359
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I33d298deb5cf55e09d30edbca00bda780c1c5e94
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions