tree 10da860fcff71886af91d082e31f0e1917926848
parent a1ce3b5cee66b0e43a58ce940817a06ea2a6e7eb
parent f5697c5904c3765e362fad47bf200103cf9d0e4c
author Baligh Uddin <baligh@google.com> 1414566070 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566070 +0000

am f5697c59: (-s ours) am 171ed627: (-s ours) am 6670a579: (-s ours) am a8484d84: (-s ours) Import translations. DO NOT MERGE

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