| commit | 30bef4b6056759dc3a42f73fa881e7947f54f888 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 14 20:59:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:59:12 2014 +0000 |
| tree | 4e7ec699006b78d116024621f74302c250c1cfaa | |
| parent | ac075f4dfd94ae329018d4b1221731c76a48bfb8 [diff] | |
| parent | 98e5bd3c3f94a159e8c5da8eb5b3bd086f6c4d8d [diff] |
am 98e5bd3c: (-s ours) am d46f31f6: (-s ours) am eb7ed429: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit * commit '98e5bd3c3f94a159e8c5da8eb5b3bd086f6c4d8d': Import translations. DO NOT MERGE