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

git log --pretty=format:"%h %ad | %s%d [%an]" origin/android/l/mr1/master..origin/abt/topic/gmin/l-dev/mr1/sensors/master:
  8e32e87 Thu Jun 25 16:42:34 2015 +0200 | GMINL-12124: Fix timestamps on SX9500 capacitive proximity sensor (origin/abt/topic/gmin/l-dev/mr1/sensors/master, sensors) [Patrick Porlan]

git diff --stat origin/android/l/mr1/master..HEAD:
  control.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)

Change-Id: Id387ab7f3e31755256b1b66476500e40625cccf4
Tracked-On: https://jira01.devtools.intel.com/browse/GMINL-12124
Signed-off-by: Viorel Suman <viorel.suman@intel.com>