diff options
| author | Miranda Kephart <mkephart@google.com> | 2020-11-10 01:50:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 01:50:09 +0000 |
| commit | 41772e6d9537ae912db698505b759fc6f6b9552d (patch) | |
| tree | 32be072ff1ebac35704c3be91b35bd3123985473 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 255001d08f255ea19802c19f6f5e6074030694b3 (diff) | |
| parent | baf4c150264a1722ca7334dd3d18aef26851fe03 (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
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773217
Change-Id: I2d4da7bb50cc323b63b53d07161b4c145273641a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions