tree eadbbdedac4cd319166950037e165d3169adb502
parent 55157d27305d06569f0bd7d3c47ec51855f87da4
parent 9d87600a24c9b9b1c7a1d85b46971dba51d48e2c
author Baligh Uddin <baligh@google.com> 1413757426 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413757426 +0000

am 9d87600a: (-s ours) am 91bceebd: (-s ours) Import translations. DO NOT MERGE

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