diff options
| author | Miranda Kephart <mkephart@google.com> | 2020-11-10 02:58:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 02:58:09 +0000 |
| commit | ced71357a53282cb142119cfd848ed6ef366e2b8 (patch) | |
| tree | bd116ec6cf8216fd61ecddbd45aac712a8f15c01 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 02da15b14dfa14e871f4c80d39d6c6a0b1a836b0 (diff) | |
| parent | f187e7f1f9a01e875f5325351a9255360195e2c7 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into oc-dev am: d15b2f5bce am: 0d82d9ffc9 am: a4fbde5687 -s ours am: b1b2354740 -s ours am: 29802fb39f am: 378d3ae57d -s ours am: 8254a62829 am: baf4c15026 am: 41772e6d95 am: f187e7f1f9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773217
Change-Id: Ia96c861aef7f4de7ded0617586d934e7b4434309
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions