OSDN Git Service

Merge remote-tracking branch 'origin/abt/topic/gmin/kitkat/sensors' into gmin/kitkat...
authorsuyyala <sridhar.uyyala@intel.com>
Thu, 12 Jun 2014 21:45:04 +0000 (14:45 -0700)
committersuyyala <sridhar.uyyala@intel.com>
Thu, 12 Jun 2014 21:45:34 +0000 (14:45 -0700)
git log --pretty=format:"%h %ad | %s%d [%an]" origin/abt/topic/gmin/kitkat/master..origin/abt/topic/gmin/kitkat/sensors:
  088195d Thu Jun 12 13:12:52 2014 -0700 | Rename opt_scale property name (origin/abt/topic/gmin/kitkat/sensors, m/abt/topic/gmin/kitkat/master) [suyyala]
  96575ae Thu May 29 14:29:51 2014 -0700 | Do not update calibsense if prop read fails [arun]
  05610d9 Thu May 29 16:29:16 2014 +0300 | Gyro Calibration [Adriana Reus]

git diff --stat origin/abt/topic/gmin/kitkat/master..origin/abt/topic/gmin/kitkat/sensors:
  Android.mk         |  1 +
  calibration.h      | 16 ++++++++++
  common.h           |  2 ++
  control.c          |  3 ++
  enumeration.c      | 32 ++++++++++++++++---
  gyro-calibration.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
  transform.c        |  6 ++--
  7 files changed, 141 insertions(+), 9 deletions(-)

Change-Id: I3f544c65cf85fab54b5df233cf3b85ebd568309d
Signed-off-by: suyyala <sridhar.uyyala@intel.com>

Trivial merge