tree 8bae99d79254102aadde0639a0a3df65e66d4c5a
parent 610fac8a7dd71bc6ceff9a62bf771f4825e3f754
parent c53605ee0a5f3a1145c8662941c999e8bc8d7968
author Eric Fischer <enf@google.com> 1320941700 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320941700 +0000

am c53605ee: (-s ours) am 66fbc0eb: (-s ours) Import revised translations.  DO NOT MERGE

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