tree 81a59c5620f003d321ead35661aaa6cb9af97976
parent 150b4cba73bf27ce6c348e8eeadd9a7949913725
parent 70cf1b97586a4f1ffa04fe0d83c3590fc22f6a56
author Eric Fischer <enf@google.com> 1302640094 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1302640094 -0700

am 70cf1b97: (-s ours) am 68cb0ffa: (-s ours) am 71a556f2: Import revised translations.  DO NOT MERGE

* commit '70cf1b97586a4f1ffa04fe0d83c3590fc22f6a56':
  Import revised translations.  DO NOT MERGE