| commit | 5bd1cb79bb8298be238b1be903703ae32fcecb99 | [log] [tgz] |
|---|---|---|
| author | Etienne Le Grand <etn@google.com> | Sat Apr 05 04:48:21 2014 +0000 |
| committer | Etienne Le Grand <etn@google.com> | Sat Apr 05 04:48:21 2014 +0000 |
| tree | 7b3a20aa5ea3b9439d6022a25f1a90e11fa0b7b6 | |
| parent | c6854530e1c707d86e4c2203354e66aa2ee8fdf4 [diff] |
Revert "Fix Merge conflict (Add heart rate monitor ...to sensors.h)" This reverts commit c6854530e1c707d86e4c2203354e66aa2ee8fdf4. Change-Id: Idc821b6645be6bfd9878cfc777010a123f013f0a