diff options
| author | Julia Reynolds <juliacr@google.com> | 2021-04-27 22:35:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-27 22:35:23 +0000 |
| commit | d295decb53fcfb1a6d70e9be285a5dde217d8fd2 (patch) | |
| tree | e1a6ff8180051fe1b15e55e3bd1df0bc7d62e72f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 99f54b9b9e4bf95905fb8ebb6f34b8287747b08e (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: I486e5614e4d829ec51a8d19719085a7941268c46
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions