diff options
author | Geoff Mendal <mendal@google.com> | 2016-02-03 10:31:45 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-02-03 10:31:45 +0000 |
commit | e5214199094323efd0b13f4a403bf3456d22a997 (patch) | |
tree | 8d5310b1da89a5fa92ce081e6cef6811755f7129 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 84f4b8a84a00339d2a2f0561e07d475401bc2915 (diff) | |
parent | 6dfc27dac9eadfa86c811cbbff0e08887d81769d (diff) |
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 9561ec3353 -s ours
am: 6dfc27dac9 -s ours
* commit '6dfc27dac9eadfa86c811cbbff0e08887d81769d':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions