tree cc106cf772232e5cdbe5fa58711532b62b3fd571
parent 584b6ece308cf595885393a12dc732fcf6a6e75e
parent c3cc414cb613283b5324708c4919b899aec415d5
author Baligh Uddin <baligh@google.com> 1408285457 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408285457 +0000

am c3cc414c: (-s ours) am d19f38a9: (-s ours) Import translations. DO NOT MERGE

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