tree 92e900ae9ebecc948a5af77814f2fea28a748479
parent 9b6cd7e770982c27134788bfa506833162d7dfde
parent e30003381c4f51f149baea598efcc16e69f44c99
author Baligh Uddin <baligh@google.com> 1389112917 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389112917 -0800

am e3000338: (-s ours) am 3163fb88: (-s ours) Import translations. DO NOT MERGE

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