diff options
| author | Miranda Kephart <mkephart@google.com> | 2020-11-10 00:16:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 00:16:56 +0000 |
| commit | 29802fb39fbe283a2fc732528fa017ecb43c7960 (patch) | |
| tree | 4d74103311b8d8542e4c985050fa015c997983e8 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | f69d6cfbbb0983d26b660b9b38ab84658987ac86 (diff) | |
| parent | b1b235474092ea22bfb5305576aaf3c103d7ec9e (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773217
Change-Id: I6e11f1ea93ff828f590bd661a4f2128053476343
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions