summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorMiranda Kephart <mkephart@google.com>2020-11-09 19:21:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-09 19:21:46 +0000
commit547f99bbdac2e54e67177ead5f54dda10a2ea429 (patch)
treedf159bda6cb6b935a5853d133ec09966cc43aeed /tools/aapt2/java/JavaClassGenerator.cpp
parentf2bc09c705921e38d473fc02c6d961515b6f8af3 (diff)
parent8b691cfceadab956d4030834ddaddaaa78084938 (diff)
[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into pi-dev am: be1f0f2863 -s ours am: 8b691cfcea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773074 Change-Id: I2565ed28629196b6292f0f699e5370e34375a93d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions