diff options
| author | Miranda Kephart <mkephart@google.com> | 2020-11-10 01:16:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 01:16:21 +0000 |
| commit | 8254a62829b6aae75279cec29dc31e8c300b265d (patch) | |
| tree | b47c311bbc29c4fdd301d1cc96d797b28e1fdede /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 435a7cd8fb31688b2fb0bf25edcdf1713cde7ed5 (diff) | |
| parent | 378d3ae57df7af7d8fb72a2d47e2903443b47d60 (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 am: 378d3ae57d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773217
Change-Id: Ib64d353455f4a70a88b5fa90cec66cc021d6ea8a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions