tree bd793b72aacba91b14f16c7e2d38326c9b59189c
parent 4c33ab66b96eca5177b34f314b044809f32a6b90
parent 05f28558bd281e5fae40bc31b3049714aa702174
author Baligh Uddin <baligh@google.com> 1443387357 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443387357 +0000

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

* commit '05f28558bd281e5fae40bc31b3049714aa702174':
  Import translations. DO NOT MERGE