| commit | 926462fa15820c0000aa0b878155fd37f7315dd7 | [log] [tgz] |
|---|---|---|
| author | JP Abgrall <jpa@google.com> | Sat Apr 05 04:48:39 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Apr 05 04:48:40 2014 +0000 |
| tree | 6ca753fe3cc2743fa8f85e400dd57ecc244c7466 | |
| parent | 9275d516fbfd8a11dfea0daeb45cd1039fa23cd0 [diff] | |
| parent | 8ae345d0c90bbc920e1224083da10094b5a69cfe [diff] |
Merge "Revert "Fix Merge conflict (Add heart rate monitor ...to sensors.h)""