diff options
| author | Geoff Mendal <mendal@google.com> | 2016-01-11 16:06:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-11 16:06:23 +0000 |
| commit | e4476a79048550f480f9a3f4719c94242808558f (patch) | |
| tree | fadf62a55b6367b372a2696e5a6959da1e82a182 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4fdce74459541b24ce52700a7f9c4f93de323d47 (diff) | |
| parent | e7ca49b098cf64c106275703ddae36a5cbf4ade0 (diff) | |
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am: 66841a62f1 -s ours am: 73992aee94 -s ours am: 0663959eb7 -s ours am: 8635657b17 -s ours am: 4c042b096e -s ours
am: e7ca49b098 -s ours
* commit 'e7ca49b098cf64c106275703ddae36a5cbf4ade0':
Revert "Import translations. DO NOT MERGE"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions