tree 3df13b324209e6ab022e8508522255c975507533
parent a06b350e554cf7f2fc150d2ee1e0d888e6e0f69e
parent d2cd24d8ce86e32656c03fa4f1125e76790385b5
author Eric Fischer <enf@google.com> 1300489601 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300489601 -0700

am c0604255: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

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