summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorMiranda Kephart <mkephart@google.com>2020-11-10 01:33:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-10 01:33:11 +0000
commitd6490ef65c25b1993a423c11df4412814a324eb7 (patch)
tree83316e2a47326cd5ee26bdb4bc9cf1b647c78a54 /tools/aapt2/java/JavaClassGenerator.cpp
parent668f0c1a35ff64a8292e77415ef813c4c65c0afb (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: I50e9b96980554bf1de7535011cbcf1a10631c2ca
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions