tree f16e86b9795bd265c996028481e7a3556995480a
parent 7f10b1d04881e3737087641accc4b9eefa7cd2d7
parent 9d15d3c09076a0d944bf5b8c4cbf9dbf21536da8
author Baligh Uddin <baligh@google.com> 1387481318 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387481318 -0800

am 9d15d3c0: (-s ours) am d3b2e5b9: (-s ours) Import translations. DO NOT MERGE

* commit '9d15d3c09076a0d944bf5b8c4cbf9dbf21536da8':
  Import translations. DO NOT MERGE