tree c424146ec6cc1618fed19bdaeadbffe8dd82cc3f
parent c266e3fe6c3cb5ec7d315585eb7bb1950332598e
parent d8c14af3c7bfa9158953772be3447a9f26593e1c
author Eric Fischer <enf@google.com> 1296326846 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296326846 -0800

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

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