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:47:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-07-25 22:47:31 +0000
commitb43041a8e9fff4eee9204c67566ed5db31c63449 (patch)
treec4d95362a2300c874edd814ed2771ce678bada50 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent8db381c0a0b5abb85f864b2a41033013c993071b (diff)
parent8255f2c11aec4a688ccc2b6561554ed8ababf5cb (diff)
Merge changes I19e53731,I12ec6445 into nyc-mr1-dev-plus-aosp
* changes: Merge \"QS: Cleanup detail toggle on\" into nyc-mr1-dev am: 5c6f5afd19 QS: Cleanup detail toggle on am: 35a9c14cc6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions