summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEtienne Le Grand <etn@google.com>2014-04-05 17:05:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-05 17:05:32 +0000
commitd5aa52756fe21c23096e333afc74e3589a11d216 (patch)
tree6ca753fe3cc2743fa8f85e400dd57ecc244c7466
parent90578ec858d36a37fa1f642465d429381ecae00e (diff)
parente6bee250643159b835dd23f6837e360f4282d615 (diff)
downloadhardware_libhardware-d5aa52756fe21c23096e333afc74e3589a11d216.zip
hardware_libhardware-d5aa52756fe21c23096e333afc74e3589a11d216.tar.gz
hardware_libhardware-d5aa52756fe21c23096e333afc74e3589a11d216.tar.bz2
am e6bee250: (-s ours) am 71a50543: Merge "Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"" into klp-modular-dev
* commit 'e6bee250643159b835dd23f6837e360f4282d615': Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"
0 files changed, 0 insertions, 0 deletions