diff options
| author | Tianjie Xu <xunchang@google.com> | 2021-04-20 00:36:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-20 00:36:23 +0000 |
| commit | b5cce57d38824db63e1c1dc8aa1a531e7f6620e3 (patch) | |
| tree | 6f89a4a807189d1206bd1ac016a10f9daa7dac57 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b991befbe04875b61aa1f33560746d5b4e99a4ee (diff) | |
| parent | 9d515f3ad7b50bd2100f4b93414eebe149116011 (diff) | |
[automerger skipped] Merge "Addresses TODO in ResumeOnRebootService Javadoc" am: f58b4a1109 am: 894b984747 am: 9d515f3ad7 -s ours
am skip reason: skip tag Change-Id I7669bbfc3975c164e773b9517dde5e3437b2fc1a with SHA-1 47b9ccdf1c is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673754
Change-Id: I9f94f763f0cb5c5ed7d240d57faac16b3060503d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions