summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorMiranda Kephart <mkephart@google.com>2020-11-09 19:21:51 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-09 19:21:51 +0000
commitd57c2cec331552737c400140709363824e04d4dc (patch)
treedf159bda6cb6b935a5853d133ec09966cc43aeed /tools/aapt2/java/JavaClassGenerator.cpp
parent547f99bbdac2e54e67177ead5f54dda10a2ea429 (diff)
parent523686c52bb54fcafcc3f3196c306b0459944e7d (diff)
[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into oc-mr1-dev am: 09b6ab6bdf -s ours am: 6a3d33dfcf -s ours am: 523686c52b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773216 Change-Id: I97af05fe31487483d461cdb34a17438096e2e01c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions