diff options
| author | Etienne Le Grand <etn@google.com> | 2014-04-05 04:48:21 +0000 |
|---|---|---|
| committer | Etienne Le Grand <etn@google.com> | 2014-04-05 04:48:21 +0000 |
| commit | 5bd1cb79bb8298be238b1be903703ae32fcecb99 (patch) | |
| tree | 7b3a20aa5ea3b9439d6022a25f1a90e11fa0b7b6 /modules/nfc | |
| parent | c6854530e1c707d86e4c2203354e66aa2ee8fdf4 (diff) | |
| download | hardware_libhardware-5bd1cb79bb8298be238b1be903703ae32fcecb99.zip hardware_libhardware-5bd1cb79bb8298be238b1be903703ae32fcecb99.tar.gz hardware_libhardware-5bd1cb79bb8298be238b1be903703ae32fcecb99.tar.bz2 | |
Revert "Fix Merge conflict (Add heart rate monitor ...to sensors.h)"
This reverts commit c6854530e1c707d86e4c2203354e66aa2ee8fdf4.
Change-Id: Idc821b6645be6bfd9878cfc777010a123f013f0a
Diffstat (limited to 'modules/nfc')
0 files changed, 0 insertions, 0 deletions