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-27 23:58:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-07-27 23:58:19 +0000
commit56fc279b7da5c259892ae6d35f45d12be5351925 (patch)
treeee2eea87c164fc5a85d2b0ed551c44ba39801840 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf846766375f24d8e46b51155fcbc30d1f1f48222 (diff)
parent1108b99e7c008a2aebe870eb68f91b6aa4104acc (diff)
Merge changes I17119726,Ia1ae819a into nyc-mr1-dev
* changes: Merge \"docs: Moving internationalized versions of multi-window doc\" into nyc-dev am: 76f3cc7fc0 docs: Moving internationalized versions of multi-window doc am: 82a38458e6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions