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