tree a5e4ae81facf4bb1fafd29e1486c2295c66f5a0f
parent 8c5d2fd7b4f551103d18d60fba4f549a077b0cbe
parent e7d4f0f9bd2f6bfe264d602a523a4d0eaa647176
author Eric Fischer <enf@google.com> 1303121263 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1303121263 -0700

am e7d4f0f9: am 41f61f09: (-s ours) Import revised translations.  DO NOT MERGE

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