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

am 17d9bf66: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-lunchbox

* commit '17d9bf66dc81e26bc4cd79a52519adf7ed63a276':
  Import translations. DO NOT MERGE