summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorMiranda Kephart <mkephart@google.com>2020-11-09 23:27:26 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-09 23:27:26 +0000
commitc4863cf1d13a9c2f071175f427d7f772da09ad31 (patch)
treec0c1434efac7994e39152c293e0ac65ab075af9d /tools/aapt2/java/JavaClassGenerator_test.cpp
parentfe792d874ae4416afea94b1fbc4e798bba400d8a (diff)
parent3215114ad66785bcd7d0eacdf71d8c5945884757 (diff)
[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into pi-dev am: be1f0f2863 -s ours am: 8b691cfcea am: 547f99bbda -s ours am: f9052f7905 am: 3215114ad6 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773074 Change-Id: I5a1d527fec96a844ffc7c6bd0ff53e1090cedef2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions