tree 4af90bc6432dc6ec6cc9071949add993a493d6b1
parent 28d7b230060f7c3d80f7a1cb53fbea1a93c1ddf8
parent 1b079725add337a35ec0157acc6365cec67a3cf1
author Eric Fischer <enf@google.com> 1260517239 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260517239 -0800

am 1b079725: (-s ours) am e381d79d: am da4092ba: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '1b079725add337a35ec0157acc6365cec67a3cf1'

* commit '1b079725add337a35ec0157acc6365cec67a3cf1':
  Import revised translations.  DO NOT MERGE