| commit | 7d28ff47a46ebd5c065f26778a21ef1db6a90e0b | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Aug 22 18:49:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 22 18:49:11 2014 +0000 |
| tree | 4cef82b77e5cb47cc4d8fa3cf0782c6df18a42ff | |
| parent | 0f65b5aad1ed3909f08f8c57193e9a6761398f9c [diff] | |
| parent | 593a663f405bbb80931be1ebc95fb3250cb27151 [diff] |
am 593a663f: (-s ours) am 9821a0ab: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '593a663f405bbb80931be1ebc95fb3250cb27151': Import translations. DO NOT MERGE