tree 68f4f5113592f2a3fe72bfd28c06e37aa80ccf02
parent 0a1af42571021b1da51349e1fd0ae87fd98b813b
parent edf3cbdddd756e34fe0a4cf8321248aa684fd2f2
author Eric Fischer <enf@google.com> 1298439349 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1298439349 -0800

am edf3cbdd: (-s ours) am d57d9abd: (-s ours) am a47d23f9: Import revised translations.  DO NOT MERGE

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