OSDN Git Service

Merge remote-tracking branch 'origin/abt/topic/gmin/l-dev/sensors/master' into mr1
authorViorel Suman <viorel.suman@intel.com>
Thu, 19 Mar 2015 11:44:25 +0000 (13:44 +0200)
committerViorel Suman <viorel.suman@intel.com>
Thu, 19 Mar 2015 11:45:00 +0000 (13:45 +0200)
commit81c9888ba4c515381ad6ad5b3b7d71545d4f6ec6
treee893cc89379a42132a614c730f1397c69bb656b2
parent7c33fc169569c9097418478b99f6be69497cb58d
parent6aafc79c0a99523762e6e294ca8d4caa00dcbf25
Merge remote-tracking branch 'origin/abt/topic/gmin/l-dev/sensors/master' into mr1

git log --pretty=format:"%h %ad | %s%d [%an]" origin/abt/topic/gmin/l-dev/mr1/master..origin/abt/topic/gmin/l-dev/sensors/master:
  6aafc79 Tue Mar 17 09:34:57 2015 +0100 | Add support for proximity sensor supporting events. (origin/abt/topic/gmin/l-dev/sensors/master, m/abt/topic/gmin/l-dev/master, s-new) [Adriana]

git diff --stat origin/abt/topic/gmin/l-dev/mr1/master..HEAD:
  common.h      |  2 +-
  control.c     | 15 ++++++++++++++-
  enumeration.c | 36 ++++++++++++++++++++++++++++++++++++
  3 files changed, 51 insertions(+), 2 deletions(-)

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