diff options
| author | Winson Chiu <chiuwinson@google.com> | 2020-12-08 00:52:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 00:52:54 +0000 |
| commit | c141682801fbeb003f5fe3c91da274cb0f9f4be2 (patch) | |
| tree | 1d87ef7407e8e39eb178f7045d5d2076f3b53dec /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 8f769e1796f2fbe9878b3948b8f9e32898b92cdd (diff) | |
| parent | 4f4568795c5612abb6465c12aac5421a97d8d35c (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 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: Ida70c096a452507129050a8c282a561da60fff57
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions