tree 0c193604b9eab20d865aeb70cf21c89b1da17a6d
parent 66ec9e2ff09b2ee42dd7ba81471fbf4c4597dab2
parent e4195b33a2e0d03a1933e7a782e2841ed6891621
author Eric Fischer <enf@google.com> 1255478398 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255478398 -0700

am e4195b33: (-s ours) am 7554f6ed: am 72fb5e90: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'e4195b33a2e0d03a1933e7a782e2841ed6891621'

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