summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorMiranda Kephart <mkephart@google.com>2020-11-09 19:58:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-09 19:58:09 +0000
commit2df3d9fb22b5f8ba0823ac8b4a6866c9c3222aa0 (patch)
tree3e7920f37250db201a3ff520573e7789e2de6e79 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentd43cdd3ec719d413f78bc8193ecf5923a4e01598 (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: I38ef0470f95853590397c248dcba18bc56199074
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions