platform_hardware_libhardware/include
JP Abgrall c6854530e1 Fix Merge conflict (Add heart rate monitor ...to sensors.h)
Change-Id: I376e4dbb13d64f4987d4a8be82afddb625eefa54

Conflicts:
	include/hardware/sensors.h
2014-04-04 20:51:05 -07:00
..
hardware Fix Merge conflict (Add heart rate monitor ...to sensors.h) 2014-04-04 20:51:05 -07:00