summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorAravind Akella <aakella@google.com>2014-04-11 19:34:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-11 19:34:51 +0000
commit8ebd66c259602f6b0be26fdfd3fe2f55538f6424 (patch)
treeaa5e2f41ebf2eeb723cfd464ce4a51f54307b31d /graphics
parent9e99cab7d9a0ec2315140c21bb1958eb7ff76a09 (diff)
parentcd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314 (diff)
downloadframeworks_base-8ebd66c259602f6b0be26fdfd3fe2f55538f6424.zip
frameworks_base-8ebd66c259602f6b0be26fdfd3fe2f55538f6424.tar.gz
frameworks_base-8ebd66c259602f6b0be26fdfd3fe2f55538f6424.tar.bz2
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
Diffstat (limited to 'graphics')
0 files changed, 0 insertions, 0 deletions