| commit | 8ebd66c259602f6b0be26fdfd3fe2f55538f6424 | [log] [tgz] |
|---|---|---|
| author | Aravind Akella <aakella@google.com> | Fri Apr 11 19:34:51 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 11 19:34:51 2014 +0000 |
| tree | aa5e2f41ebf2eeb723cfd464ce4a51f54307b31d | |
| parent | 9e99cab7d9a0ec2315140c21bb1958eb7ff76a09 [diff] | |
| parent | cd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314 [diff] |
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 'cd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314': Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor