diff options
| author | Winson Chiu <chiuwinson@google.com> | 2020-12-08 04:01:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 04:01:47 +0000 |
| commit | d5b3480c710a707f536be493b0dc80db0291de77 (patch) | |
| tree | 9a5fbc2ee2b6dadf724edaf3e54f2e5828a24443 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 31ba467a830209a5bb279935ce14b4511367aaab (diff) | |
| parent | 8a7fc10c89a4a11473623ff904ad68c4b4018ea9 (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 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: I0e9c5410f8ebfc7f1877f066e3dbb63ec8daf12b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions