diff options
| author | Miranda Kephart <mkephart@google.com> | 2020-11-09 23:28:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:28:02 +0000 |
| commit | 6f0c6390b3d80a149efd55bb7720475d373330a2 (patch) | |
| tree | 884167f03987e592389fcce8669d06b82d9479d1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ada794bdd3024f9ca614bc28420d636bd36ba883 (diff) | |
| parent | 0feebb84735b8e08f45d1888f3ab6f861244cb88 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into oc-mr1-dev am: 09b6ab6bdf -s ours am: 6a3d33dfcf -s ours am: 523686c52b am: d57c2cec33 -s ours am: 9f188f3867 am: 2df3d9fb22 am: 0feebb8473
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773216
Change-Id: I570acee9ee4b82a438ce2aa5e487da49944319ea
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions