diff options
| author | Miranda Kephart <mkephart@google.com> | 2020-11-10 02:36:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 02:36:23 +0000 |
| commit | f187e7f1f9a01e875f5325351a9255360195e2c7 (patch) | |
| tree | 884167f03987e592389fcce8669d06b82d9479d1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 06e81aa16a2d05d090c65c82bcfa6fb23c374948 (diff) | |
| parent | 41772e6d9537ae912db698505b759fc6f6b9552d (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: 8254a62829 am: baf4c15026 am: 41772e6d95
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773217
Change-Id: I7c98a10703763dd2b4a532adc69f7b6354f942d1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions