summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorMiranda Kephart <mkephart@google.com>2020-11-10 01:32:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-10 01:32:20 +0000
commitbaf4c150264a1722ca7334dd3d18aef26851fe03 (patch)
treeb9f6ae549939e365cdaa9cdc8e1444bd7b56835f /tools/aapt2/java/JavaClassGenerator.cpp
parentecf2db455cf5529cca56d30a1f43309570e43cf7 (diff)
parent8254a62829b6aae75279cec29dc31e8c300b265d (diff)
[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into oc-dev am: d15b2f5bce am: 0d82d9ffc9 am: a4fbde5687 -s ours am: b1b2354740 -s ours am: 29802fb39f am: 378d3ae57d -s ours am: 8254a62829
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773217 Change-Id: I19a8241d8c5adbfccc53e1e19f387621d3a688d6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions