| commit | d951ab230d80631731ef12b5d76c678c30165d6a | [log] [tgz] |
|---|---|---|
| author | Aravind Akella <aakella@google.com> | Fri Apr 11 19:40:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 11 19:40:31 2014 +0000 |
| tree | 62de29e78b420aab4917ed60001863e906940e80 | |
| parent | 68b9d97593d2ec79892813ab06f1b89c41de64b0 [diff] | |
| parent | 8ebd66c259602f6b0be26fdfd3fe2f55538f6424 [diff] |
am 8ebd66c2: am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev * commit '8ebd66c259602f6b0be26fdfd3fe2f55538f6424': Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor