diff options
| author | Winson Chiu <chiuwinson@google.com> | 2020-12-08 00:46:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 00:46:42 +0000 |
| commit | 4f4568795c5612abb6465c12aac5421a97d8d35c (patch) | |
| tree | 07a268d71c4fd05017a9d2cae47c31e5272085a5 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 69eed6d3378b6b60f2894425f99cf4dd4daeae2b (diff) | |
| parent | b2dd5af43bee1c51c9c91a614b57be40d4ecc404 (diff) | |
[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-mr1-dev am: 9109ce178e -s ours am: b2dd5af43b -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: I3dd66c59e491cbc85e5279a911eec8e539d0180c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions