tree c474df7d1925e2310d516e08d148585bfa7186e1
parent 17d9bf66dc81e26bc4cd79a52519adf7ed63a276
parent 57251be2d77ad94f05c49d42d682ec008a6e211d
author Baligh Uddin <baligh@google.com> 1392154098 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1392154098 -0800

am 57251be2: (-s ours) Import translations. DO NOT MERGE

* commit '57251be2d77ad94f05c49d42d682ec008a6e211d':
  Import translations. DO NOT MERGE