summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorJulia Reynolds <juliacr@google.com>2020-06-03 17:56:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 17:56:46 +0000
commitd4ffc6921baa06b629f9f7d36b5d6c4ff7a42c7a (patch)
treeb45438064b523d5babe9041f112d077255929726 /tools/aapt2/java/JavaClassGenerator.cpp
parent461f4e3ff91a7101725c99485c6e0d5aae3035c8 (diff)
parent6d81ec0c0e01f7e899e688ce1ddb596efcf86ec9 (diff)
[automerger skipped] Merge "DO NOT MERGE Make intents immutable" into oc-dev am: 1e8240d82f am: 53f1a99fa0 am: 18b5a53447 -s ours am: 0b212d65e1 -s ours am: a9f6ccf964 am: dae7a3468c -s ours am: 6a2eb025f4 am: 6d81ec0c0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11635218 Change-Id: I0020e9beca182f4aa4d1991513fe945483e1ad87
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions