| commit | 66fad0e3e7db1ca02fa0af968008ed02e47c593c | [log] [tgz] |
|---|---|---|
| author | Etienne Le Grand <etn@google.com> | Sat Apr 05 01:48:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Apr 05 01:48:40 2014 +0000 |
| tree | fab3e808ed28e7ade2099c8abe86ddc19c32edaf | |
| parent | ec580a3fd3cc9bc73099111b6afe7234e96b8a95 [diff] | |
| parent | 61c78d9804625ea2ec56c855602682aaa7dd5a75 [diff] |
am 61c78d98: Merge "Add heart rate monitor, stringType and requiredPermissions to sensors.h" into klp-modular-dev * commit '61c78d9804625ea2ec56c855602682aaa7dd5a75': Add heart rate monitor, stringType and requiredPermissions to sensors.h