tree 1f73d388f5b053f3afc357da49a2916f7e0ab9e7
parent b32faf8b8edbe549243b49e2a5f1d6298a86592e
parent 758853c43e42c12602aa86fff9915266f5b7bb3e
author Baligh Uddin <baligh@google.com> 1408163363 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408163363 +0000

am 758853c4: (-s ours) am 02cb9e79: (-s ours) am c029b460: (-s ours) am 8462ebf7: (-s ours) Import translations. DO NOT MERGE

* commit '758853c43e42c12602aa86fff9915266f5b7bb3e':
  Import translations. DO NOT MERGE