diff options
| author | Miranda Kephart <mkephart@google.com> | 2020-11-09 23:28:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:28:50 +0000 |
| commit | eb5cab6f4feac2dfad688e65030106af6f4b22e1 (patch) | |
| tree | c0c1434efac7994e39152c293e0ac65ab075af9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e5d716c29b9a0e82d95a2d7fb7b7e2b6ae3fcd73 (diff) | |
| parent | 6f0c6390b3d80a149efd55bb7720475d373330a2 (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 am: 6f0c6390b3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773216
Change-Id: I5a222ae937b75bd18092a45feb1d26285e85d344
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions