tree a92af857cae528f25a404b0301e9e05fd988e431
parent 413075099d724c35781e4f6ac3f71fd0bf474ab5
parent 3d2fefae6de81055952b815b872ff5d7d5c34c0a
author Baligh Uddin <baligh@google.com> 1392410329 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410329 +0000

am 3d2fefae: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '3d2fefae6de81055952b815b872ff5d7d5c34c0a':
  Import translations. DO NOT MERGE