resolved conflicts for merge of 5e610d6a to master

Change-Id: Ibeaa176ff4b25f81559d14dd8c73283ee4f2eacf

diff --cc include/hardware/sensors.h
index 96fdaab,2fa6e28..85834de
--- 1/include/hardware/sensors.h
--- 2/include/hardware/sensors.h
+++ b/include/hardware/sensors.h
@@@ -212,14 -226,32 +226,39 @@@ __BEGIN_DECL
   *
   * Pressure sensors report events at a constant rate defined by setDelay().
   *
 + * Gyro
 + * --------
 + *
 + * The gyroscope sensor values are returned in degrees per second (dps)
 + *
 + * Gyroscope sensor report events at a constant rate defined by setDelay().
 + *
+  * Gravity
+  * -------
+  * A gravity output indicates the direction of and magnitude of gravity in the devices's
+  * coordinates.  On Earth, the magnitude is 9.8.  Units are m/s^2.  The coordinate system
+  * is the same as is used for the acceleration sensor.
+  *
+  * Linear Acceleration
+  * -------------------
+  * Indicates the linear acceleration of the device in device coordinates, not including gravity.
+  * This output is essentially Acceleration - Gravity.  Units are m/s^2.  The coordinate system is
+  * the same as is used for the acceleration sensor.
+  *
+  * Rotation Vector
+  * ---------------
+  * A rotation vector represents the orientation of the device as a combination
+  * of an angle and an axis, in which the device has rotated through an angle
+  * theta around an axis <x, y, z>. The three elements of the rotation vector
+  * are <x*sin(theta/2), y*sin(theta/2), z*sin(theta/2)>, such that the magnitude
+  * of the rotation vector is equal to sin(theta/2), and the direction of the
+  * rotation vector is equal to the direction of the axis of rotation. The three
+  * elements of the rotation vector are equal to the last three components of a
+  * unit quaternion <cos(theta/2), x*sin(theta/2), y*sin(theta/2), z*sin(theta/2)>.
+  * Elements of the rotation vector are unitless.  The x, y, and z axis are defined
+  * in the same was as for the acceleration sensor.
   */
+ 
  typedef struct {
      union {
          float v[3];