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