tree d1a91df7d3c0c5477aefcbf289d75b99c7e96644
parent 947419d1039260eefba830fe7b35dde7cd8cd586
parent def782b3ca9bf16b96a49cad2783438fb5ea5b45
author Baligh Uddin <baligh@google.com> 1413757706 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413757706 +0000

am def782b3: (-s ours) am 99113fd0: (-s ours) am c159c3ac: (-s ours) Import translations. DO NOT MERGE

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