tree 3a127674d57425a52aa7576db7500c50e3d511ba
parent 5f178d0027b943f911a33dbb74911e3890c3c3e8
parent e24fee17ac4b65854413d3b720c44e329433c33c
author Baligh Uddin <baligh@google.com> 1442632413 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442632413 +0000

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

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