tree 7ab926c1d670417ccd4b8581c9bf49bb78d5d357
parent e0b9a1f72415cdb119356901fd66f5b35115747e
parent 0491f0f16d528179206623a086a353f62863df88
author Baligh Uddin <baligh@google.com> 1383797167 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383797167 -0800

am 0491f0f1: (-s ours) Import translations. DO NOT MERGE

* commit '0491f0f16d528179206623a086a353f62863df88':
  Import translations. DO NOT MERGE