Merge commit 'b74a239fd2e729c41b0cb87cbc606530ed631a41' into froyo-plus-aosp * commit 'b74a239fd2e729c41b0cb87cbc606530ed631a41': String change to refer to wifi tether as hotspot
Merge commit 'b74a239fd2e729c41b0cb87cbc606530ed631a41' into froyo-plus-aosp * commit 'b74a239fd2e729c41b0cb87cbc606530ed631a41': String change to refer to wifi tether as hotspot