diff options
| author | Julia Reynolds <juliacr@google.com> | 2021-04-27 22:34:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-27 22:34:19 +0000 |
| commit | 3047db2d71dd040739e4796de8e59c85ada2aac3 (patch) | |
| tree | 23775d8a0280412eff723c1341776e7e971380c3 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 86a35875341f4e1f44d799a9eaa2f1517ee01af1 (diff) | |
| parent | 2a061f2e25ad754f68e68a8a3f97b763a655ae45 (diff) | |
[automerger skipped] Merge "Restrict alarm broadcast" into oc-mr1-dev am: 3b0fc6bd38 am: d749dc3510 am: fd89965284 am: 90ef2704fa -s ours am: 2a061f2e25 -s ours
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 4056976f1e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14103469
Change-Id: I613fab60acf69ed0daf08587149db3fcf22e8042
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions