am 0460e26a: resolved conflicts for merge of 691be97f to gingerbread-plus-aosp

Merge commit '0460e26a4c9915f77c915d2cc3540969802b02fa'

* commit '0460e26a4c9915f77c915d2cc3540969802b02fa':
  add new sensor types for handling gyro data and device orientation