tree 812d7782a76f7faeefac726acad6653854d83b7e
parent 87d9d1a0405e6cdbcd7c87cfebee04b622100753
parent dc5e02bdccbbc60ede21ae706f06c696b6983812
author Baligh Uddin <baligh@google.com> 1396310962 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396310962 +0000

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

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