commit | 4258f621fcb18820e1ddb382713bab898e4ef913 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Feb 14 20:51:00 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:51:00 2014 +0000 |
tree | 4e7ec699006b78d116024621f74302c250c1cfaa | |
parent | 551d0621e317be6cd6d9241a804f41b666a2ff1e [diff] | |
parent | 5f4f95ca35f84018159787f2b39da074b38b82e5 [diff] |
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 '5f4f95ca35f84018159787f2b39da074b38b82e5':