diff options
author | Geoff Mendal <mendal@google.com> | 2015-11-23 17:46:15 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-11-23 17:46:15 +0000 |
commit | 4b66f74aaec86f2719ebd6f4a6d396ecee0540a2 (patch) | |
tree | 05178a81061b55b44c37550f7ad31c9030da6810 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | e309a7f951aa2c6bc0337a1324cbb237c641d8ca (diff) | |
parent | 57b3e7508d1adb81cbe3b5aff24fbaaa71de9ce2 (diff) |
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: ae7c51a9cc -s ours
am: 57b3e7508d -s ours
* commit '57b3e7508d1adb81cbe3b5aff24fbaaa71de9ce2':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions