summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2019-06-03 21:21:09 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-03 21:21:09 -0700
commit52276d7e0f9aa30e29768f36face4ab0686c7b2b (patch)
tree3f00de842c707aa6ba28fc0cb1486bd81aa9200c /tools/aapt2/java/JavaClassGenerator_test.cpp
parent950cbfe7977b5b11b9c57b758e25f0832349cda3 (diff)
parentf61e5f24100ca5bd0606a4e628ad8fbe3723b9c2 (diff)
Merge "Revert "[DO NOT MERGE] Handle config override via settings correctly"" into qt-dev
am: f61e5f2410 Change-Id: Ifac7c0a43c42060ed73cbb07e8b83fcfb6b3922b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions