summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-03-03 08:10:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-03 08:10:50 +0000
commit6c6d48d22897f15125faa517bb3cba92ce868819 (patch)
tree8300eb1fa38f05f53ee6a356e8eff00b39931c1e /tools/aapt2/java/JavaClassGenerator_test.cpp
parent6b5ceccc48843bec7f11337b683146edbe688def (diff)
parentc5cd3bcbc14d81c01c1dd363531dabbf9ed188b7 (diff)
[automerger skipped] Merge "Add pkg target to snoozing alarm" into oc-mr1-dev am: 119ebe193f -s ours am: c5cd3bcbc1 -s ours
am skip reason: Change-Id I6aaf80a11dcae2eca41d4647411126ed41587027 with SHA-1 b341523840 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13675028 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4dd96fe01db3d858df4a6360c34ec6fc1b6f5ba4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions