am 49f2b2b7: merge from froyo-plus-aosp

Merge commit '49f2b2b7660ec820155859d5919fdb08d0d98187'

* commit '49f2b2b7660ec820155859d5919fdb08d0d98187':
  Replaced deprecated SensorListener with new SensorEventListener