tree f27c2232ec0a0e5490172caf6747fb70d2fe8961
parent 8387fb1565edff39fea78dd5b6448a79781868ed
parent d951ab230d80631731ef12b5d76c678c30165d6a
author Aravind Akella <aakella@google.com> 1397245416 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397245416 +0000

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