| commit | 21e135773b4754b7479dc83e4f2ca839c49d1d1c | [log] [tgz] |
|---|---|---|
| author | Aravind Akella <aakella@google.com> | Fri Apr 11 19:43:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 11 19:43:36 2014 +0000 |
| tree | f27c2232ec0a0e5490172caf6747fb70d2fe8961 | |
| parent | 8387fb1565edff39fea78dd5b6448a79781868ed [diff] | |
| parent | d951ab230d80631731ef12b5d76c678c30165d6a [diff] |
am d951ab23: 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 'd951ab230d80631731ef12b5d76c678c30165d6a': Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor