summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorMiranda Kephart <mkephart@google.com>2020-11-09 23:26:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-09 23:26:57 +0000
commitf0f44cdcaa0af66dfaef8e20a7c0eb8b8999b132 (patch)
treeda4cb2ad6c93805a36fe545bcac688babc18c18e /tools/aapt2/java/JavaClassGenerator_test.cpp
parente92d1f42a2265324337e81d6e55a638b872c1fc7 (diff)
parentd43cdd3ec719d413f78bc8193ecf5923a4e01598 (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: d43cdd3ec7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773074 Change-Id: Iefdb3ffab152130eb0322120aca661b5ed858db0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions