tree f16e86b9795bd265c996028481e7a3556995480a
parent d5fa1db872ff4a6349c590dcdf6aedf651b5a762
parent 8475e7a484ee8f8f3f4e189e767d822c1cb325d4
author Baligh Uddin <baligh@google.com> 1389117815 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389117815 +0000

am 8475e7a4: (-s ours) am 5498bd2b: (-s ours) am 0f0ffc64: (-s ours) am 484fad59: (-s ours) Import translations. DO NOT MERGE

* commit '8475e7a484ee8f8f3f4e189e767d822c1cb325d4':
  Import translations. DO NOT MERGE