tree 915118bc0d78b16c39cbea3e4ea75eac3a062892
parent 45aec3ad61df50a416f1dc42ef82598765c21adc
parent f80b03623fc7e9c1abafc0d067eb50d2cc1cc730
author Eric Fischer <enf@google.com> 1319237974 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319237974 -0700

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

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