tree ff1b6b58a770fcd89b6ad5394dbc403a82a833aa
parent 6869492677bad16fe8c60c1e0560dce66554896f
parent 596b55d9c82a52049702931839f69a12cd7dc920
author Dan Morrill <morrildl@google.com> 1285116333 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285116333 -0700

am 596b55d9: am 62018429: Merge "Adding new feature definitions for new sensors (barometer and gyroscope.)" into gingerbread

Merge commit '596b55d9c82a52049702931839f69a12cd7dc920'

* commit '596b55d9c82a52049702931839f69a12cd7dc920':
  Adding new feature definitions for new sensors (barometer and gyroscope.)