diff options
author | Geoff Mendal <mendal@google.com> | 2016-02-03 10:36:01 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-02-03 10:36:01 +0000 |
commit | b8783e59338a49eb160f6e7b66d10dc5b2b57b84 (patch) | |
tree | 8d5310b1da89a5fa92ce081e6cef6811755f7129 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 3cddac44fd60e05047aa510b6d4973b47dec0475 (diff) | |
parent | aa7e0396c9bc23180bb856ae92081bd4e6b0da71 (diff) |
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3122eedcd3 -s ours
am: aa7e0396c9 -s ours
* commit 'aa7e0396c9bc23180bb856ae92081bd4e6b0da71':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions