tree 3e896131b6d551c8c3cda55632c4a2f7a5d6a2b4
parent c10d29d73202df1bb11dc58967fa49dba536fd3f
parent c79f26d8022092c6e629aed2f5bb902ca616d277
author Eric Fischer <enf@google.com> 1301433594 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301433594 -0700

am c79f26d8: am 38002e3b: am 001a1458: (-s ours) Import revised translations.  DO NOT MERGE

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