am 5f43c96a: am 515c6b44: Merge "fix an issue where SensorService could request an invalid sensor delay" into ics-mr1
am 5f43c96a: am 515c6b44: Merge "fix an issue where SensorService could request an invalid sensor delay" into ics-mr1

* commit '5f43c96a7143be443bdfd1fd07eb400ae653d99e':
  fix an issue where SensorService could request an invalid sensor delay

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base