am e6bee250: (-s ours) am 71a50543: Merge "Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"" into klp-modular-dev

* commit 'e6bee250643159b835dd23f6837e360f4282d615':
  Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"
This commit is contained in:
Etienne Le Grand 2014-04-05 17:05:32 +00:00 committed by Android Git Automerger
commit d5aa52756f

Diff content is not available