tree b4fe1b024e28dcd569490366cc2dae964bb19910
parent 357556f1d434d2f194910696c447057c57624960
parent 1500d483aac56cdedd6f3874a7125cfd827a8251
author Eric Fischer <enf@google.com> 1320880838 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320880838 +0000

am 1500d483: am f68330f6: (-s ours) Import revised translations.  DO NOT MERGE

* commit '1500d483aac56cdedd6f3874a7125cfd827a8251':
  Import revised translations.  DO NOT MERGE