| commit | 8ae345d0c90bbc920e1224083da10094b5a69cfe | [log] [tgz] |
|---|---|---|
| author | JP Abgrall <jpa@google.com> | Sat Apr 05 04:47:55 2014 +0000 |
| committer | JP Abgrall <jpa@google.com> | Sat Apr 05 04:47:55 2014 +0000 |
| tree | 7b3a20aa5ea3b9439d6022a25f1a90e11fa0b7b6 | |
| parent | c6854530e1c707d86e4c2203354e66aa2ee8fdf4 [diff] |
Revert "Fix Merge conflict (Add heart rate monitor ...to sensors.h)" This reverts commit c6854530e1c707d86e4c2203354e66aa2ee8fdf4. Turns out more work in klp-something-something is needed. So this needs undoing to get the builds fixed. Change-Id: Ic38e2b312fa48c4489f54fc688fb0f1114c13d4a