diff options
| author | Julia Reynolds <juliacr@google.com> | 2021-04-27 23:16:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-27 23:16:14 +0000 |
| commit | 81285249e8fa880371e3b45de5a7a5dc43e5dedf (patch) | |
| tree | 70707c563daa0d352f1d94987f75d9d11b853ca6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2d9b1f63b48420ec1a3778c9bff85ad839d83993 (diff) | |
| parent | d295decb53fcfb1a6d70e9be285a5dde217d8fd2 (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 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: Ib3d64c4c1b8927625b3f99ebb2280df1d25e2a9a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions