| commit | 428a3b14ff829faedff764d2341ab440b88d3e4d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 14 20:59:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:59:07 2014 +0000 |
| tree | 4e7ec699006b78d116024621f74302c250c1cfaa | |
| parent | bcf2e80caad9b13716ee853868e71ae8a7be0252 [diff] | |
| parent | 4258f621fcb18820e1ddb382713bab898e4ef913 [diff] |
am 4258f621: (-s ours) am 5f4f95ca: (-s ours) am ea8f1f18: (-s ours) am 98989bd7: (-s ours) am 835c0b74: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose * commit '4258f621fcb18820e1ddb382713bab898e4ef913':