tree cba62d0d64153aa2169651696bc238591341d679
parent 5e7108fee856fddd0a782b3e181d7c9f02e68972
parent 551d0621e317be6cd6d9241a804f41b666a2ff1e
author Baligh Uddin <baligh@google.com> 1414085267 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085267 +0000

am 551d0621: (-s ours) am f0942091: (-s ours) am 861cdc99: (-s ours) am 8446d354: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '551d0621e317be6cd6d9241a804f41b666a2ff1e':