tree 0d1b3fd94b9aea5c6d9b98edc489e0f5ea6fc0fe
parent 208071f50f93cd4968161c3ecfbb505f71c63934
parent 2a998cf48ef3d3d3dc372012d7c736482b713c2b
author Baligh Uddin <baligh@google.com> 1403729227 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403729227 +0000

am 16e3a8e6: (-s ours) am d550530c: (-s ours) Import translations. DO NOT MERGE

* commit '16e3a8e6dbbef2e495f481fe29d498800f0e4a63':
  Import translations. DO NOT MERGE