Merge remote-tracking branch 'origin/abt/topic/gmin/l-dev/sensors/master' into l...

Merge remote-tracking branch 'origin/abt/topic/gmin/l-dev/sensors/master' into l-dev/mr1/master

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:
  ef3a026 Fri Apr 3 18:30:17 2015 +0300 | include events.h instead of copying the defines (origin/abt/topic/gmin/l-dev/sensors/master, m/abt/topic/gmin/l-dev/master, newbranch) [Adriana Reus]

git diff --stat origin/abt/topic/gmin/l-dev/mr1/master..HEAD:
  activity_event_entry.c |  1 +
  common.h               | 99 --------------------------------------------------
  control.c              |  2 +-
  3 files changed, 2 insertions(+), 100 deletions(-)

Change-Id: I578ab4914c2e356c83f305fada95832ed29a7373
Signed-off-by: Adriana Reus <adriana.reus@intel.com>