diff options
author | Geoff Mendal <mendal@google.com> | 2015-10-26 17:01:01 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-10-26 17:01:01 +0000 |
commit | 8d5d666355cfa68ed49f8b019228ff9c7cc87ca6 (patch) | |
tree | 5575698cb245d7a32272edcf5a2311258a1b2faa /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 79017f52f8a01b6dd6182550c8bf9497c5bc7b7b (diff) | |
parent | b5e060ad63aec34e95b67f7632a2914b31fd2ca6 (diff) |
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 14bb0511c6 -s ours am: 6995e0bf08 -s ours am: eeb2376185 -s ours
am: b5e060ad63 -s ours
* commit 'b5e060ad63aec34e95b67f7632a2914b31fd2ca6':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions