summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-06-22 15:59:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-22 15:59:08 +0000
commit714adab81875f5f77be296cd25e065eef8976b40 (patch)
treeaac8c142363ab9f0ebb8849c75d98990b5725288 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent51a3f42c9fd96c95d0b774295f2468136fd7b268 (diff)
parentf957999055df1392bd4b9776e743c8b04ad30564 (diff)
Merge "Merge \\"QS: Fix default icon handling for services\\" into nyc-dev am: 94a20367b5 am: be7b7690e5" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions