tree 7e283ddab8120c238cd73632cb7ec3e66e718ca4
parent 2ebd753f70057bcc1264b3d4cdfad6fbbbbd3f89
author Eric Fischer <enf@google.com> 1328897309 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897309 -0800

am 3f9bc412: (-s ours) am dfeefe6a: Import translations. DO NOT MERGE

* commit '3f9bc4128e2f59cef855863dcb71de5d0ecaf69b':
  Import translations. DO NOT MERGE