| commit | c6854530e1c707d86e4c2203354e66aa2ee8fdf4 | [log] [tgz] |
|---|---|---|
| author | JP Abgrall <jpa@google.com> | Fri Apr 04 20:51:05 2014 -0700 |
| committer | JP Abgrall <jpa@google.com> | Fri Apr 04 20:51:05 2014 -0700 |
| tree | 4a3b638bafd4df7ebd9b6c90854d520aa8bad38f | |
| parent | ed39dc7f5e2decd0946bd239e95aa3640a682345 [diff] |
Fix Merge conflict (Add heart rate monitor ...to sensors.h) Change-Id: I376e4dbb13d64f4987d4a8be82afddb625eefa54 Conflicts: include/hardware/sensors.h