| commit | 15540b98394b85cb61c8c9113a731b00819f98d4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Dec 10 20:46:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 10 20:46:11 2014 +0000 |
| tree | e9a03184c58372d675772990658ff47af427e366 | |
| parent | 2993c6fa2e16886839e38ed7fc9b297c6452c645 [diff] | |
| parent | ef31966232fe2c91d58d651f1acdb8234736b470 [diff] |
am ef319662: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'ef31966232fe2c91d58d651f1acdb8234736b470': Import translations. DO NOT MERGE