tree dda308a5457480cb631020220850521645f1399e
parent d65fb393595cb093936c7d5d0d54b0511430aa9d
parent cff2d6a2d904b7d88096650021aa428cfdc08632
author Baligh Uddin <baligh@google.com> 1388116261 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1388116261 -0800

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

* commit 'cff2d6a2d904b7d88096650021aa428cfdc08632':
  Import translations. DO NOT MERGE