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-07-21 01:06:09 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-21 01:06:09 +0000
commite195484f6479d43a8360fe8703666adb9a839c50 (patch)
treeefbeecfdafe61474e19d16364138f0eb767da6e3 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentdea89ca31ccde7b0761c989d146695d3b1f03844 (diff)
parent7ae1a08e409539680c2c858d9e724658618c77de (diff)
Merge "Merge "Don't turn on prox when wirelessly charging." into rvc-d1-dev am: 7e387342d6 am: c8b62b40b6" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions