OSDN Git Service

resolved conflicts for merge of 335e0e08 to mnc-dr-dev-plus-aosp
authorNick Kralevich <nnk@google.com>
Tue, 1 Sep 2015 16:37:33 +0000 (09:37 -0700)
committerNick Kralevich <nnk@google.com>
Tue, 1 Sep 2015 16:37:33 +0000 (09:37 -0700)
commit4b69cbd6e95da7a209f839804e0fef7494a15459
tree809fc868f39d0462cebc8209c23802149fb24745
parent2fcd675b40ad9c94c1ff9506cdea63a48a81c9d6
parent335e0e08e9d9c0265e0f171dccf8d9a7790e2218
resolved conflicts for merge of 335e0e08 to mnc-dr-dev-plus-aosp

Change-Id: I77587cf9128b003ed0f77ddfe11e688dcfe37a9c
include/android/sensor.h