diff options
| author | Miranda Kephart <mkephart@google.com> | 2020-11-09 19:38:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 19:38:10 +0000 |
| commit | f9052f7905f0fdbecb6f1512587ef1b06c7dedb7 (patch) | |
| tree | 07513cc1941805b8927620e346072963a040a10c /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 5a72f60cd99a197c64a225831445987fbe437b7e (diff) | |
| parent | 547f99bbdac2e54e67177ead5f54dda10a2ea429 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into pi-dev am: be1f0f2863 -s ours am: 8b691cfcea am: 547f99bbda -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773074
Change-Id: I89f46c211ed0966b169ceeeb94fdf1f6cc999911
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions