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
tree: a256638d3011fb38e1251c564b63883409a73bb6
  1. bridge/
  2. create/
  3. .gitignore
  4. Android.mk
  5. README