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-06-12 22:30:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-12 22:30:50 +0000
commit41155873a927778e9f47d0eadcc4e9244445a311 (patch)
tree3cbe2edf29bad40022593fd7b66d3cfd632c3282 /tools/aapt2/java/JavaClassGenerator_test.cpp
parente4a1cf086eca930576299d6b21d21fdc12e0f5b4 (diff)
parentc7bd746c6fc0fdf4530739a13e5229d4153da1da (diff)
Merge "Merge "Avoid unexpected screen off during perf testing" into rvc-dev am: 92b6167fc8 am: 6474cf0230 am: b2a46806bf" into rvc-qpr-dev-plus-aosp am: c7bd746c6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836347 Change-Id: I36975fb71cc6fadb1aef28757becfe1a1d8fb2b4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions