summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorMiranda Kephart <mkephart@google.com>2020-11-09 19:58:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-09 19:58:32 +0000
commit47dc1eb2b0b7a32de4305b54353950e81669de6d (patch)
treefec3c0d983ff37625d82b1d9a7df9579ec1e4c67 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent3215114ad66785bcd7d0eacdf71d8c5945884757 (diff)
parent9f188f3867c05c18c27ab9f4a7dafbb4843aecfe (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 am: d57c2cec33 -s ours am: 9f188f3867
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773216 Change-Id: Icbcf55e02f08583becdc6e879d5b6d7e7f962faf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions