diff options
author | Geoff Mendal <mendal@google.com> | 2016-02-03 11:55:09 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-02-03 11:55:09 +0000 |
commit | 6e701f7e5626e1fc3ab85a7e59c105bf92298a16 (patch) | |
tree | 78148f4ea7a01b1dc65fa2ac0114409cf1e48c62 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 31500b4101f44ce44e1535a9748d2d1f6ed28ff4 (diff) | |
parent | f80ebaf32e4950bf0b2cd15c0a09a94ccfaa2c6c (diff) |
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: e6faf1a713 -s ours
am: f80ebaf32e -s ours
* commit 'f80ebaf32e4950bf0b2cd15c0a09a94ccfaa2c6c':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions