tree b5166242e6ede5e678a3b0f1a39360ce31455468
parent aed6f403b4d3a1e01b6a865a93d13fff7e7d3e9e
parent 6549ea52aefbae7188067c8273705771de230e2f
author Eric Fischer <enf@google.com> 1319501652 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319501652 -0700

am 6549ea52: (-s ours) am 495f9022: (-s ours) Import revised translations.  DO NOT MERGE

* commit '6549ea52aefbae7188067c8273705771de230e2f':
  Import revised translations.  DO NOT MERGE