diff options
author | Miranda Kephart <mkephart@google.com> | 2021-04-01 16:07:45 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-01 16:07:45 +0000 |
commit | 4fd98847ac5959573a36c6ef07aa4624fffdc864 (patch) | |
tree | b42a84a88bc8e0da17c968e16b61c5ef897fb35c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | aa6e043a4d06d3b1f08b112ab61e78e9c8bce0b8 (diff) | |
parent | b7ee17360d21332bf4111e6574e3bf246fdf3784 (diff) |
[automerger skipped] Merge "[DO NOT MERGE] Make PendingIntents in screenshots immutable" into rvc-dev am: 637a90a745 am: b7ee17360d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13950908
Change-Id: I2ff7f4850eae62607ffdbc0000da46bb7506fd68
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions