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