diff options
| author | Miranda Kephart <mkephart@google.com> | 2020-11-09 19:38:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 19:38:30 +0000 |
| commit | 9f188f3867c05c18c27ab9f4a7dafbb4843aecfe (patch) | |
| tree | 07513cc1941805b8927620e346072963a040a10c /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | f9052f7905f0fdbecb6f1512587ef1b06c7dedb7 (diff) | |
| parent | d57c2cec331552737c400140709363824e04d4dc (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773216
Change-Id: I393900e64a8f9f1fef560fa088ad2728739b35d6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions