am 515c6b44: Merge "fix an issue where SensorService could request an invalid...
am 515c6b44: Merge "fix an issue where SensorService could request an invalid sensor delay" into ics-mr1
* commit '515c6b44':
fix an issue where SensorService could request an invalid sensor delay