am f11bf284: am 305bc0fe: Merge "Fix a race condition in sensormanager" into gingerbread

* commit 'f11bf284d355e2a8378c6a37a7ed702705ec6144':
  Fix a race condition in sensormanager