OSDN Git Service

resolved conflicts for merge of b01a043d to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Sat, 21 Aug 2010 00:30:45 +0000 (17:30 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Sat, 21 Aug 2010 00:30:45 +0000 (17:30 -0700)
commit5e610d6ad6f3461722e0291b980f521a413fa05e
treeec0da09e85c000609e80b94f63c859f37d027d50
parent3691181b21454bcd56c9521e8b61d96ed6e01f84
parentb01a043df41e987321f6c01930ac306befb1d3dc
resolved conflicts for merge of b01a043d to gingerbread-plus-aosp

Change-Id: I60466613c7ea0335a78d553a10876367d65557d9
include/hardware/sensors.h