tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 67a5fdcd1fa54bd5a6b162e824f0bb42244cf286
parent 5b120dfd3a72e9974fa7fefa3d67ffc7aec39aa3
author Baligh Uddin <baligh@google.com> 1392411039 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411039 +0000

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 '5b120dfd3a72e9974fa7fefa3d67ffc7aec39aa3':