tree fc73b3e653ec186d7a19f9ac4f1ced32faa504ca
parent 7c023c4ae4ea52824e81cc771dcc2c2013722bf6
parent c29121baeebe177386ba953ef3edc324c84ef6c3
author Baligh Uddin <baligh@google.com> 1398806135 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398806135 +0000

am c29121ba: (-s ours) am 0961a545: (-s ours) Import translations. DO NOT MERGE

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