tree cba62d0d64153aa2169651696bc238591341d679
parent 9eeffa8f91f15446ee6b54496b95f79cdb50ded4
parent 459394de4a5f2bcbf09d8dfb0b76e5a340937294
author Baligh Uddin <baligh@google.com> 1414085452 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085452 +0000

am 459394de: (-s ours) am 62a708f4: (-s ours) am 339e0c19: (-s ours) am 3be0912b: (-s ours) am 2a44d878: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '459394de4a5f2bcbf09d8dfb0b76e5a340937294':