Merge commit '8dc16c27e23dae5bdf65fd2a2ced97c2f645a633' into gingerbread-plus-aosp * commit '8dc16c27e23dae5bdf65fd2a2ced97c2f645a633': Fix typo in GPS mode logic.
Merge commit '8dc16c27e23dae5bdf65fd2a2ced97c2f645a633' into gingerbread-plus-aosp * commit '8dc16c27e23dae5bdf65fd2a2ced97c2f645a633': Fix typo in GPS mode logic.