tree d8d2a645079e7e380315ac3c207fbaa967c7340b
parent de17ad285b2ab025eb986017e1fd0bf636ce9ae9
parent c862dd192ba0225e3ff4908991de6240becb830e
author Baligh Uddin <baligh@google.com> 1389073575 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389073575 +0000

am c862dd19: (-s ours) am eba4fb66: (-s ours) am e0659df8: (-s ours) Import translations. DO NOT MERGE

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