diff options
| author | Julia Reynolds <juliacr@google.com> | 2020-06-03 16:39:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 16:39:01 +0000 |
| commit | fcd539618b28b3c8dcc647ee45dfad1322cd97b7 (patch) | |
| tree | 0715273c5921f89eef60f7f518d5f871f4603dd9 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 6303b95446ac01cfcf0dd69db983f4e6432c0188 (diff) | |
| parent | 4c111e69661ed9f85214c9f52d08ba9d73bdde92 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Make intents immutable" into oc-mr1-dev am: b6bf062ea4 -s ours am: 6c5b7271c7 -s ours am: 9e2625148d am: 4c111e6966 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11630373
Change-Id: I655e663c8ca9dd694654ef7152bac37823795d5f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions