OSDN Git Service

Merge remote-tracking branch 'origin/abt/topic/gmin/l-dev/mr1/sensors/master' into...
authorViorel Suman <viorel.suman@intel.com>
Wed, 24 Jun 2015 12:33:53 +0000 (15:33 +0300)
committerViorel Suman <viorel.suman@intel.com>
Wed, 24 Jun 2015 12:33:54 +0000 (15:33 +0300)
git log --pretty=format:"%h %ad | %s%d [%an]" origin/android/l/mr1/master..origin/abt/topic/gmin/l-dev/mr1/sensors/master:
  d3a01e8 Thu Jun 18 18:05:18 2015 +0200 | GMINL-10383: Allow for prioritization of sensors (origin/abt/topic/gmin/l-dev/mr1/sensors/master, sensors) [Patrick Porlan]

git diff --stat origin/android/l/mr1/master..HEAD:
  description.c | 28 ++++++++++++++++++++++------
  description.h | 27 ++++++++++++++-------------
  enumeration.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 93 insertions(+), 19 deletions(-)

Change-Id: I100d0c5a916c785826d757c283e8b8b809c81d45
Signed-off-by: Viorel Suman <viorel.suman@intel.com>

Trivial merge