tree 3a9059dd2737e1c7655ea0e2f426242546a50b80
parent 16a9bb786401e34ab146ea6ac8e4ec3a00127efd
parent 2a06b43ac56557e62a357b9b0928059a67c63c56
author Eric Fischer <enf@google.com> 1336501783 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336501783 -0700

am 2a06b43a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '2a06b43ac56557e62a357b9b0928059a67c63c56':
  Import translations. DO NOT MERGE