| commit | 0f1fb55b8632542264ebb745618719f4f8bd8d44 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 25 17:49:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 17:49:28 2014 +0000 |
| tree | dd8f7c195ddee7cc64d0ef9debd04dfebd00e719 | |
| parent | 271929761551a0b515194bcdb6364d1b12522b88 [diff] | |
| parent | 6a0ec6e60616811bb19a25ce79c74361968642c4 [diff] |
am 6a0ec6e6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '6a0ec6e60616811bb19a25ce79c74361968642c4': Import translations. DO NOT MERGE