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-16 10:09:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-16 10:09:39 +0000
commita092dcaa1c8578fa4abb13f10a6f03644442f0b9 (patch)
treef600a700a723368b495094007267a629368cef8f /tools/aapt2/java/JavaClassGenerator_test.cpp
parent7c00e15378cb370c2052be0d9fe5b66ec17c7dc0 (diff)
parent5a49e9c9237771896796149d75d3b78a77a554b5 (diff)
Merge "Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev am: c985571e5e -s ours" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions