tree 7137ea83baf8fcfb4dd39cffaa6ca9d86f2f9dfb
parent bcda271a209a79b366f7268aa3174af53fe25bd4
parent ef9c9fe179cc640f78ba504bf9a50396a11f3e56
author Eric Fischer <enf@google.com> 1250622522 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1250622522 -0700

am ef9c9fe1: (-s ours) am 44aee3b6: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'ef9c9fe179cc640f78ba504bf9a50396a11f3e56'

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