tree fbb275f0fe01e5ab5f39bf9b826b9652e345f4f5
parent 1cb0b3fb2a48bf1b5daf63f312989a133fb4b8ef
parent 81aa20eb68f897cf8bea7ed9e29f4a3a5b6ec212
author Baligh Uddin <baligh@google.com> 1442632433 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442632433 +0000

am 81aa20eb: (-s ours) am 21699347: (-s ours) Import translations. DO NOT MERGE

* commit '81aa20eb68f897cf8bea7ed9e29f4a3a5b6ec212':
  Import translations. DO NOT MERGE