tree de87fc4ead71ed1f7daf9225978b6e5862600863
parent fdbbd9271b4e5c2aaadc79b5f9b24a70d3b3e26e
parent 8722692e0418b92b423630ceca1cc5d01a59cb53
author Eric Fischer <enf@google.com> 1338489381 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338489381 -0700

am 8722692e: Import translations. DO NOT MERGE

* commit '8722692e0418b92b423630ceca1cc5d01a59cb53':
  Import translations. DO NOT MERGE