diff options
author | Geoff Mendal <mendal@google.com> | 2016-02-03 10:37:05 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-02-03 10:37:05 +0000 |
commit | a6f5fe64f4cee0cae193d2a7fea9691bbdfaedb6 (patch) | |
tree | 8d5310b1da89a5fa92ce081e6cef6811755f7129 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b8783e59338a49eb160f6e7b66d10dc5b2b57b84 (diff) | |
parent | 4d79bcf457141b91417ae2033ab6b3313665ca8d (diff) |
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 063357312c -s ours
am: 4d79bcf457 -s ours
* commit '4d79bcf457141b91417ae2033ab6b3313665ca8d':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions