tree ce2138f9edd7ed2c5a515389bcfdb2028d16f307
parent 30d6fd6b28aeacfe06ddc7adaac34e8a0032df40
parent 75b332037f6197acb239bfbbf2ac09adb31e9971
author Etienne Le Grand <etn@google.com> 1396717544 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396717544 +0000

am 75b33203: am 4369a4eb: Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"

* commit '75b332037f6197acb239bfbbf2ac09adb31e9971':
  Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"