| commit | c3d8e0e76ad1ef0039bbf14478be2fa06d5a9875 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Sep 19 07:19:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 07:19:49 2014 +0000 |
| tree | 3adaee92a711e15e92093b3b6d9e5de3aa258de8 | |
| parent | c18dcedd78d1e5218e39596dee6b58b979babbd7 [diff] | |
| parent | 6bd8103b5925a09872153a935982f896dba457ad [diff] |
am 6bd8103b: (-s ours) am 9b0ae11d: (-s ours) am 8262c348: (-s ours) am f89add8d: (-s ours) am d5937725: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '6bd8103b5925a09872153a935982f896dba457ad':