summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-07-06 06:40:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-06 06:40:31 +0000
commit59c0115e5ca0eedef6a03287dbdef4c5cce1c54c (patch)
tree9b61136dd180e4d823e458bb7a51d8b4c84be785 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent490007fd5db5665793fee5cfe8946d525c73db60 (diff)
parentaa0ff1e465047ef7eae8bd2ff2233ab079bdf2e7 (diff)
Merge "Merge "Add strings for a "Tethering hardware acceleration" setting." into oc-dr1-dev am: cf694adee3 am: 0c385ebead"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions