diff options
| author | Miranda Kephart <mkephart@google.com> | 2020-11-09 23:44:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:44:55 +0000 |
| commit | 8912e0a06ce2a06ae7de386d246c63e484eb9d45 (patch) | |
| tree | c0c1434efac7994e39152c293e0ac65ab075af9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c379e80da830debea129e8387137e5d81681c86f (diff) | |
| parent | ae97066bb9a1bc84abd36d5ad4ab4b3d31385f0d (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into qt-dev am: b968a16db7 am: 2a84aae3ce -s ours am: 4e7a7d3cd3 am: ae97066bb9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773073
Change-Id: I73b80e5783faf0ac7270ac88abc9f8ccd1320936
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions