tree 4123a9a062cde342deb62b522774674ef3bce03a
parent 7b672f7853b39d50f64018458fbf8b4786dab71f
parent ed459a8f55ba1b09c728d324802cc9816e729687
author Baligh Uddin <baligh@google.com> 1412095098 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412095098 +0000

am ed459a8f: (-s ours) am 5d95f0c5: (-s ours) Import translations. DO NOT MERGE

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