tree d1a91df7d3c0c5477aefcbf289d75b99c7e96644
parent b8c7336ba6306f486417e0cf245082eee77828b2
parent 99113fd03232f1c53aac40a2a4331b2344dd8c14
author Baligh Uddin <baligh@google.com> 1413757422 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413757422 +0000

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

* commit '99113fd03232f1c53aac40a2a4331b2344dd8c14':
  Import translations. DO NOT MERGE