diff options
| author | Miranda Kephart <mkephart@google.com> | 2020-11-09 23:59:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:59:00 +0000 |
| commit | b1b235474092ea22bfb5305576aaf3c103d7ec9e (patch) | |
| tree | 229caccbdaef1c0ad45dda7e7994d2ea77370e90 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b20d5c3add1bec5eb5298a1a53913bdb449b5df0 (diff) | |
| parent | a4fbde56877e3e9a7d38084336d5eacb79fe28e1 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into oc-dev am: d15b2f5bce am: 0d82d9ffc9 am: a4fbde5687 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773217
Change-Id: Id0fb465308b80daad70c5f896dbc0d77bed796de
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions