OSDN Git Service

(root) / android-x86 / hardware-libhardware.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0f519a9 38014a7)
Merge commit '38014a7c' into lmp-dev
authorGriff Hazen <griff@google.com>
Fri, 29 Aug 2014 00:02:50 +0000 (17:02 -0700)
committerGriff Hazen <griff@google.com>
Fri, 29 Aug 2014 00:02:50 +0000 (17:02 -0700)
commitf0f67e6af93a601546b1d915b147dda5da295a1f
treedf164659f77c7cbc5d9b069c6deb15ef2a51803ftree | snapshot
parent0f519a9e5ede300ba9fe5f307700585d33564982commit | diff
parent38014a7c819ae81bbc5f92b0f43ebd464faa4a97commit | diff
Merge commit '38014a7c' into lmp-dev

Conflicts:
include/hardware/sensors.h

Change-Id: I21517f717761af7f52c003d535e86059ebb75f05
include/hardware/sensors.h diff1 | diff2 | blob | history
hardware/libhardware
About OSDN
Find Software
Develop Software
Help