OSDN Git Service

resolved conflicts for merge of 5e610d6a to master
authorKenny Root <kroot@google.com>
Tue, 24 Aug 2010 17:22:45 +0000 (10:22 -0700)
committerKenny Root <kroot@google.com>
Tue, 24 Aug 2010 17:22:45 +0000 (10:22 -0700)
commite8b8c390574c15ea477f5e3afd04ca627b976174
tree5673a8d6967d5f8a0c1987e638da5455109d9147
parentbfbf26c2c8a8c012c1c83e054522cd8cc587cece
parent5e610d6ad6f3461722e0291b980f521a413fa05e
resolved conflicts for merge of 5e610d6a to master

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