| commit | 90578ec858d36a37fa1f642465d429381ecae00e | [log] [tgz] |
|---|---|---|
| author | Etienne Le Grand <etn@google.com> | Sat Apr 05 17:00:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Apr 05 17:00:03 2014 +0000 |
| tree | 6ca753fe3cc2743fa8f85e400dd57ecc244c7466 | |
| parent | 926462fa15820c0000aa0b878155fd37f7315dd7 [diff] | |
| parent | 66fad0e3e7db1ca02fa0af968008ed02e47c593c [diff] |
am 66fad0e3: (-s ours) am 61c78d98: Merge "Add heart rate monitor, stringType and requiredPermissions to sensors.h" into klp-modular-dev * commit '66fad0e3e7db1ca02fa0af968008ed02e47c593c': Add heart rate monitor, stringType and requiredPermissions to sensors.h