diff options
| author | Geoff Mendal <mendal@google.com> | 2016-01-11 16:01:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-11 16:01:55 +0000 |
| commit | e7ca49b098cf64c106275703ddae36a5cbf4ade0 (patch) | |
| tree | c65bb49d781bae6e6ffd2ffd35b2a9c7e6ef27fa /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | da3a7d4cff5b1269ce06e88d94271cb0d4502afa (diff) | |
| parent | 4c042b096e3b25f7292d13b4c44d79cb79ebeb36 (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
* commit '4c042b096e3b25f7292d13b4c44d79cb79ebeb36':
Revert "Import translations. DO NOT MERGE"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions