tree c044ebf4b3e5e848dddd7e89b670b09ad92dbdb0
parent 9eb6db3a5a97f5bc1cf7f575fe4d8c35203fa20e
parent c7aa62a84b2d3178f9c412055379f79565bc7a30
author Eric Fischer <enf@google.com> 1318963112 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318963112 -0700

am c7aa62a8: (-s ours) Import revised translations.  DO NOT MERGE

* commit 'c7aa62a84b2d3178f9c412055379f79565bc7a30':
  Import revised translations.  DO NOT MERGE