tree a4715d80eec22ae510bf87338cc72a445c00da5d
parent bfd3bda9acf6d13849e61f601d907fdef0b12df3
parent 0cc0c216e1b68ac961cba92b3b639f06d10dcd50
author Baligh Uddin <baligh@google.com> 1392410254 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410254 +0000

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

* commit '0cc0c216e1b68ac961cba92b3b639f06d10dcd50':
  Import translations. DO NOT MERGE