diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-25 18:31:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 18:31:22 +0000 |
| commit | 1c0bbe05a0b6701996029ea86aa43f216a3c07ef (patch) | |
| tree | ff06322f6312b5fa61c3b09c8e1ff4f451588fbb /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c01ba4a2c0e99d422ff9710ef93b71f7d375fc8b (diff) | |
| parent | c99333ffcb19e61346e03aa678a7c128ecc17699 (diff) | |
[automerger skipped] Merge "AlarmManager: don't search for hctosys." am: 37d5008933 am: 5173571797 am: 6411c8e4a8 am: f0987a5f35 am: c99333ffcb -s ours
am skip reason: Change-Id Iecdf9ec03085ed8b74451b0b1ded6abd491592e7 with SHA-1 0604603705 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1334293
Change-Id: I06983f5850bf229534263ebea7bd8d58a4191ab2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions