tree a8c77c2727abb730d0b7ce591dae6269d26e3b45
parent 69413c91c5839fd061f2422ea603faf11a5dd629
parent 33cd5b9e9ecc541f4966a0d285296fb53447fdf4
author Baligh Uddin <baligh@google.com> 1386866268 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386866268 -0800

am 33cd5b9e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '33cd5b9e9ecc541f4966a0d285296fb53447fdf4':
  Import translations. DO NOT MERGE