| commit | 477fbd5c7d99c54456ceebbe3d9efd33ed5e7747 | [log] [tgz] |
|---|---|---|
| author | Aravind Akella <aakella@google.com> | Mon Apr 07 22:46:01 2014 +0000 |
| committer | Aravind Akella <aakella@google.com> | Thu Apr 10 16:57:42 2014 -0700 |
| tree | 6bd40c1cdab138fce122191a40282e2b7337db21 | |
| parent | f816eea8f1604841866e530453f956063af624bd [diff] |
Add heart rate monitor, stringType and requiredPermissions to sensors.h Merged and resolved conflicts with Ic66b792c8229867fa5ff760cdde3d7c6f3360296 Conflicts: include/hardware/sensors.h Change-Id: I47b7e5f16b50fd5272590f6daba4a9d6833b3afb