summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-06 04:40:05 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-06 04:40:05 +0000
commit8c11ac1b841f49270226282dd7a3419dbd68fc05 (patch)
tree8070e642bfa2166d7767bb775c796b37e584c8ae /tools/aapt2/java/JavaClassGenerator_test.cpp
parentd6bea417218189d233e00f4b7206643b81ff1f18 (diff)
parent5f3a39e6cc6f01e4fba552e5544ac18e4408b794 (diff)
[automerger skipped] Merge "Add proto definition for boottime metrics" into stage-aosp-master am: 9013b8eb92 am: 5f3a39e6cc -s ours
am skip reason: Change-Id I26cbca3b6f2d9f990dde31ac0880272ac141ff36 with SHA-1 3e033cb1da is in history Change-Id: Ia50df69807f9eee1f0bc94ce64a11de90d1a7e18
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions