diff options
| author | Julia Reynolds <juliacr@google.com> | 2021-04-27 23:36:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-27 23:36:08 +0000 |
| commit | 1d52698759e00aca1799114bcaf0ec43b1ce6f09 (patch) | |
| tree | c9dbc9790b6043141d6e5426005e571265e45f27 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 14a3750385bb6e0b77ee71a2d6e014d7518208e8 (diff) | |
| parent | 81285249e8fa880371e3b45de5a7a5dc43e5dedf (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: d295decb53 -s ours am: 81285249e8 -s ours
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 7dfcfe85ae is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14103469
Change-Id: Id956de36d4be564daa5d640a9f3d7c638eb43f68
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions