tree 957967ca93cd09aaa03a41ad7719f195496065a4
parent 1fd086c588ea3b3e3cd1a75cd1e48eba051c3076
parent fbe7ad7e1ce9198b968a400e9e6eb160885f022b
author Eric Fischer <enf@google.com> 1296524937 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296524937 -0800

am 3efb3153: (-s ours) am a019d15b: Merge "Import revised translations. DO NOT MERGE" into gingerbread

* commit '3efb3153137d310851346807fcc04e71144c5413':
  Import revised translations. DO NOT MERGE