diff options
| author | Miranda Kephart <mkephart@google.com> | 2020-11-10 01:50:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 01:50:54 +0000 |
| commit | aa8904e17556d5fd36ed2c9c6da90ca5d12d1eee (patch) | |
| tree | da4cb2ad6c93805a36fe545bcac688babc18c18e /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | fa6aefeac13e1beba371e1e6b1367d3a98187b1c (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: I02ee1fc039863c43ff1575a0a7e0ee8315e9f136
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions