tree 1f73d388f5b053f3afc357da49a2916f7e0ab9e7
parent 2de5fdbf6749b06cdd5a8ab52e83a20517e074e6
parent 02cb9e7998b3badd680bcc48a25de9ff1f9e08a7
author Baligh Uddin <baligh@google.com> 1408162767 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408162767 +0000

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

* commit '02cb9e7998b3badd680bcc48a25de9ff1f9e08a7':
  Import translations. DO NOT MERGE