tree a35fa2f1dffa3cd29947563ed584a4115b7a634c
parent 8e2a4b539509f03c4b3521574a910f2ea3296a66
parent fd53d8352a4617941b0a0449390aa562a01ea1d3
author Etienne Le Grand <etn@google.com> 1396662747 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396662747 +0000

am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor

* commit 'fd53d8352a4617941b0a0449390aa562a01ea1d3':
  Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor