tree d3ff5d76cdd80276263b20ba47971f391c65f8c9
parent 2bf38b38414314aed1b9841d05a1630d03bdcf73
parent 5d3ffdba3dc0bb565a9d80fa4633aee1e4929d1e
author Eric Fischer <enf@google.com> 1335893978 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335893978 -0700

am 5d3ffdba: (-s ours) Import translations. DO NOT MERGE

* commit '5d3ffdba3dc0bb565a9d80fa4633aee1e4929d1e':
  Import translations. DO NOT MERGE