tree a7a9666e4d5da05f9a282dbf5c0ae1e875977e21
parent 0f935147c8da7ca48eb6ed4e90def33867d7bc12
parent 18c1d4dfa2a721a8cfc0e971ae69c1db26f35b1f
author Baligh Uddin <baligh@google.com> 1404238841 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404238841 +0000

am 18c1d4df: (-s ours) am 588cf90a: (-s ours) Import translations. DO NOT MERGE

* commit '18c1d4dfa2a721a8cfc0e971ae69c1db26f35b1f':
  Import translations. DO NOT MERGE