tree c13b3a1fd0e163eddc8e26f1c1f915c8b5f19dc4
parent 0e795c625a6b8d6348f51924afc4f6d98757aaa1
parent 3c32f5f38a82dee1fb6f283e0408c3c265728a30
author Eric Fischer <enf@google.com> 1301432801 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301432801 -0700

am 3c32f5f3: (-s ours) Import revised translations.  DO NOT MERGE

* commit '3c32f5f38a82dee1fb6f283e0408c3c265728a30':
  Import revised translations.  DO NOT MERGE