OSDN Git Service

am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java...
authorAravind Akella <aakella@google.com>
Fri, 11 Apr 2014 19:34:51 +0000 (19:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Apr 2014 19:34:51 +0000 (19:34 +0000)
commit8ebd66c259602f6b0be26fdfd3fe2f55538f6424
treeaa5e2f41ebf2eeb723cfd464ce4a51f54307b31d
parent9e99cab7d9a0ec2315140c21bb1958eb7ff76a09
parentcd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314
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
api/current.txt
core/res/AndroidManifest.xml
core/res/res/values/strings.xml