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