tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent faf16c70c844b41106601a6e95d3ee1b129758f7
parent 192725b00598fb919e9413a2a6b2a258373cbedc
author Baligh Uddin <baligh@google.com> 1392410972 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410972 +0000

am 192725b0: (-s ours) am 20985b6e: (-s ours) am 1887e80f: (-s ours) am 4082c8c7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

* commit '192725b00598fb919e9413a2a6b2a258373cbedc':