tree 84cd0e14d5eb19b9e90aa09062414bdf5d8a75b9
parent f4b5ff043d812a4a07a172ff9f2701fa357f3842
parent 4dafa330b4095929136f5b553133c8114aeaa3a7
author Eric Fischer <enf@google.com> 1301433436 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301433436 -0700

am 4dafa330: am 0ef14e78: (-s ours) Import revised translations.  DO NOT MERGE

* commit '4dafa330b4095929136f5b553133c8114aeaa3a7':
  Import revised translations.  DO NOT MERGE