OSDN Git Service

(root) / android-x86 / hardware-libhardware.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ed39dc7) | patch
Fix Merge conflict (Add heart rate monitor ...to sensors.h)
authorJP Abgrall <jpa@google.com>
Sat, 5 Apr 2014 03:51:05 +0000 (20:51 -0700)
committerJP Abgrall <jpa@google.com>
Sat, 5 Apr 2014 03:51:05 +0000 (20:51 -0700)
commitc6854530e1c707d86e4c2203354e66aa2ee8fdf4
tree4a3b638bafd4df7ebd9b6c90854d520aa8bad38ftree | snapshot
parented39dc7f5e2decd0946bd239e95aa3640a682345commit | diff
Fix Merge conflict (Add heart rate monitor ...to sensors.h)

Change-Id: I376e4dbb13d64f4987d4a8be82afddb625eefa54

Conflicts:
include/hardware/sensors.h
include/hardware/sensors.h diff | blob | history
hardware/libhardware
About OSDN
Find Software
Develop Software
Help