diff options
| author | Geoff Mendal <mendal@google.com> | 2016-01-12 22:19:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-12 22:19:43 +0000 |
| commit | 7106af9ef2d746454eed5638efba8e782e2a639b (patch) | |
| tree | b76145a9f785953b73ab7d66634a93f5b71fc113 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | bc9029f1db5fdd40fe5cb0d00d8c33015d606fb7 (diff) | |
| parent | e4476a79048550f480f9a3f4719c94242808558f (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
am: e4476a7904 -s ours
* commit 'e4476a79048550f480f9a3f4719c94242808558f':
Revert "Import translations. DO NOT MERGE"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions