tree 10da860fcff71886af91d082e31f0e1917926848
parent d4ecf5cadb2ef887e55198a47f7ef41427fd682f
parent 4e344c28e59e94df5b5647b55924aebcd8817d68
author Baligh Uddin <baligh@google.com> 1414566075 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566075 +0000

am 4e344c28: (-s ours) am 79eaeaf7: (-s ours) am 33a5fd70: (-s ours) am 415c34b9: (-s ours) Import translations. DO NOT MERGE

* commit '4e344c28e59e94df5b5647b55924aebcd8817d68':
  Import translations. DO NOT MERGE