tree b28c195791e857a0495ff64a659613405249807a
parent ca43ef6bc7ea52efb17718017e1f883e33504c05
parent 98041f02b471b100056c3dc16e50f04a059f9a58
author Eric Fischer <enf@google.com> 1305062843 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305062843 -0700

am 98041f02: am 270fbfed: am 37259203: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit '98041f02b471b100056c3dc16e50f04a059f9a58':
  Import revised translations.  DO NOT MERGE