summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-07-25 22:51:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-07-25 22:51:39 +0000
commit23c6d928ed0b8d4241765a25a95d0d0a4111f606 (patch)
tree9d0efe23ab392239f69886d53c6728ca4fed1554 /tools/aapt2/java/JavaClassGenerator_test.cpp
parenteba36e8db95d603aa3d19286855bb57ef0e897f1 (diff)
parent74206f05331142ec0f26f6e23f3a0bac6b5a2652 (diff)
Merge changes Idf939fd3,I6ae3f730 into nyc-mr1-dev-plus-aosp
* changes: Merge \"Handle USB power role \'sink\'\" into nyc-mr1-dev am: d021ba34fb Handle USB power role \'sink\' am: 0135516153
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions