summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2016-06-22 16:03:21 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-22 16:03:21 +0000
commita831c0e366ebb7d3de98cf62c3c19a03f2decfc4 (patch)
tree1560a00fa842cee5adc8f641685e9cc08f997279 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent53fc3fc9e1326ad1b8fd511d8faf055dc7a03c59 (diff)
parent714adab81875f5f77be296cd25e065eef8976b40 (diff)
Merge \"Merge \\\"QS: Fix default icon handling for services\\\" into nyc-dev am: 94a20367b5 am: be7b7690e5\" into nyc-mr1-dev-plus-aosp
am: 714adab818 Change-Id: I31e491207bbb1677f40165385d68fdd7bccffc87
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions