tree 37606d47a6c3f8fe2072ea3c4a662f23035a951b
parent 50460e1159fd7b01a52aa6d2594cb99ca5fc915f
parent 5347324d24936c90a1395499b4420854021e4291
author Eric Fischer <enf@google.com> 1335816962 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335816962 -0700

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

* commit '5347324d24936c90a1395499b4420854021e4291':
  Import translations. DO NOT MERGE