tree c6ff43162ab75b9fbb6d3d8110a1db70856b5910
parent ce8a3164b3ce23ae860ec9ccef20ef8a66d840d2
parent a797e4669ee2c1243438ea22197fd5cdf8e1038d
author Baligh Uddin <baligh@google.com> 1378271453 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378271453 -0700

am a797e466: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10

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