tree 1f73d388f5b053f3afc357da49a2916f7e0ab9e7
parent bb10598e0adf417a319d0e854faa8212090c4842
parent 5a8490719d88eb33396be940d584d3700ab5630d
author Baligh Uddin <baligh@google.com> 1408984080 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408984080 +0000

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

* commit '5a8490719d88eb33396be940d584d3700ab5630d':
  Import translations. DO NOT MERGE