summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAravind Akella <aakella@google.com>2014-04-11 19:40:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-11 19:40:33 +0000
commitf2f0ea9cbc6e2432d6cbd8a3e5430c36aa38c955 (patch)
tree509f532fb62c4ddfd25eee66eb75335dba52e27c /include
parentb8dc4abed1035b9fda41c5fcaa5937d05c32a8bb (diff)
parent7e02753740b3be3f7100b461e628ce2f0c1823f4 (diff)
downloadhardware_libhardware-f2f0ea9cbc6e2432d6cbd8a3e5430c36aa38c955.zip
hardware_libhardware-f2f0ea9cbc6e2432d6cbd8a3e5430c36aa38c955.tar.gz
hardware_libhardware-f2f0ea9cbc6e2432d6cbd8a3e5430c36aa38c955.tar.bz2
am 7e027537: (-s ours) am d5b3c73d: Merge "DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to sensors.h" into klp-modular-dev
* commit '7e02753740b3be3f7100b461e628ce2f0c1823f4': DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to sensors.h
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions