summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorJulia Reynolds <juliacr@google.com>2020-06-03 16:25:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 16:25:43 +0000
commitfda6e8314e003f58b0adb2aa180b261382ba23a6 (patch)
tree8a0345e22f941bef3f1cff177865c629680cb2e2 /tools/aapt2/java/JavaClassGenerator.cpp
parent85597ef79711c5a9e77c281a90006a475b4b8816 (diff)
parentb93669427e175a85d27f0ab39aa793fc783002d0 (diff)
[automerger skipped] Merge "DO NOT MERGE Make intents immutable" into pi-dev am: 7f07c974df -s ours am: b93669427e -s ours
am skip reason: Change-Id I212ca5f1a48174ed85311b551259da314718f082 with SHA-1 2a92eea730 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11630371 Change-Id: I15c4c5f8121fcfa54948cea9ba49e816754c9aee
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions