| commit | 9275d516fbfd8a11dfea0daeb45cd1039fa23cd0 | [log] [tgz] |
|---|---|---|
| author | Etienne Le Grand <etn@google.com> | Sat Apr 05 04:48:27 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Apr 05 04:48:27 2014 +0000 |
| tree | 6ca753fe3cc2743fa8f85e400dd57ecc244c7466 | |
| parent | dbf0045d47109b35fc11b3aaed8a6f01bd9fe22c [diff] | |
| parent | 5bd1cb79bb8298be238b1be903703ae32fcecb99 [diff] |
Merge "Revert "Fix Merge conflict (Add heart rate monitor ...to sensors.h)""