tree f7133da72bf60350512f72ec2dfc7a22280ef39c
parent 2b9323993d78ae00c3505156b5c6627dd0eca912
parent 3d2fefae6de81055952b815b872ff5d7d5c34c0a
author Baligh Uddin <baligh@google.com> 1387301837 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387301837 -0800

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

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