diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:46:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:46:36 +0000 |
| commit | 127677373a3ca69391e07b57422b08b82e16c517 (patch) | |
| tree | c0c1434efac7994e39152c293e0ac65ab075af9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | db89f18c90a8b0b50d6a860d070af051e34ab530 (diff) | |
| parent | 6bce44e06e7eb0508f8f1b019a3f0b8e3ae44ef2 (diff) | |
Merge "[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: 2b42f2d987" into rvc-qpr-dev-plus-aosp am: 6bce44e06e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773216
Change-Id: Id1800216c60b372cdd63f9df61a4fef64f61bb3c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions