tree 9f19b8ea52fa6449975da9b09a08362e050ac508
parent 0cc0c216e1b68ac961cba92b3b639f06d10dcd50
parent 349763d0e50a144b3b693b6bf0edca0d1e1dbea2
author Baligh Uddin <baligh@google.com> 1383693823 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383693823 -0800

am 349763d0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jolly-elf

* commit '349763d0e50a144b3b693b6bf0edca0d1e1dbea2':
  Import translations. DO NOT MERGE