summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorMiranda Kephart <mkephart@google.com>2020-11-10 01:02:27 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-10 01:02:27 +0000
commit378d3ae57df7af7d8fb72a2d47e2903443b47d60 (patch)
treeb7f99b81bdfb768a4e4f8cf8bab74676b6d5addf /tools/aapt2/java/JavaClassGenerator_test.cpp
parent0bf1c91f923be0c3ffadba9dba93d0d499796be4 (diff)
parent29802fb39fbe283a2fc732528fa017ecb43c7960 (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
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773217 Change-Id: I5c486e1282f8d30f8326075345c68176ae77560c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions