tree 5a23baa1fd04ecca6c16474f0c3192060f036aed
parent fae7c821991484ac1db8a0144daf8c594aec34d9
parent 2b3b30bbb5b38cad2411b1914a2df4e13280147f
author Baligh Uddin <baligh@google.com> 1352745691 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352745691 -0800

am 2b3b30bb: (-s ours) am a965f735: Import translations. DO NOT MERGE

* commit '2b3b30bbb5b38cad2411b1914a2df4e13280147f':
  Import translations. DO NOT MERGE