tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 5ca0ed60760064ace7e9319a03d1527d4206321f
parent 5382925fa1b209315395874b0cf5027e43f70235
author Baligh Uddin <baligh@google.com> 1392411534 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411534 +0000

am 5382925f: (-s ours) am 5b120dfd: (-s ours) am 788475e9: (-s ours) am 7881f431: (-s ours) am e0916aec: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

* commit '5382925fa1b209315395874b0cf5027e43f70235':