summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorMiranda Kephart <mkephart@google.com>2020-11-09 23:28:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-09 23:28:42 +0000
commit4e7a7d3cd35bfbb2369a8c0abdad187f534728f6 (patch)
treeb47c311bbc29c4fdd301d1cc96d797b28e1fdede /tools/aapt2/java/JavaClassGenerator.cpp
parent67bd3caef0bb77adb02c73e585693f0fdf7ccb60 (diff)
parent2a84aae3ce9ffc8bef27e9fb900a9102a4875f4b (diff)
[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into qt-dev am: b968a16db7 am: 2a84aae3ce -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773073 Change-Id: I9ac009fa394162304744b7582b400a366e71e956
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions