summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJulia Reynolds <juliacr@google.com>2020-06-03 17:07:28 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 17:07:28 +0000
commit77864b93b0a9c82860c3ea35dc824f03fef0366c (patch)
tree75ffb5fd04a32913d2a62e3495de716d48b8dea2 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentb41208d2da4bb7acfc9c248b6b248fb894047d95 (diff)
parent130d46dc7a44a7490c77f34bb9ff69176499bdd2 (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: fcd539618b am: 130d46dc7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11630373 Change-Id: I43904475f99c694f1178ee597049cfbe5283f02b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions