Merge remote-tracking branch 'origin/android/l/mr1/master' into r1
git log --pretty=format:"%h %ad | %s%d [%an]" origin/android/master..origin/android/l/mr1/master:
392a6b4 Thu Sep 24 11:23:13 2015 +0300 | Merge remote-tracking branch 'origin/android/master' (origin/android/l/mr1/master, origin/android/candidates/mergerequest/llp_mr1-r2, origin/android/candidates/mergerequest/llp_mr1-r1) [Viorel Suman]
cda77fa Tue May 5 01:05:40 2015 -0700 | Add errno includes (origin/android/l/mr1/release/r1/L1R101820) [Axel Fagerstedt]
92f7407 Thu Sep 17 13:59:43 2015 +0300 | Distribute under Apache License v2.0 (origin/android/l/mr1/release/r1/L1R101810, origin/android/l/mr1/release/r1/L1R101800, origin/abt/topic/gmin/l-dev/mr1/graphics-gen/rebase/r2/2015/ww39.2, origin/abt/topic/gmin/l-dev/mr1/camera/master, origin/abt/topic/gmin/l-dev/mr1/autodetect/master) [Mihai Serban]
1ee37bf Wed Sep 2 13:25:15 2015 +0300 | calibration.h: set accel BUCKET_TOLERANCE to 2.5 (origin/android/l/mr1/release/r2/L1l000182, origin/android/l/mr1/release/r2/L1l000178, origin/android/l/mr1/release/r2/L1l000169, origin/android/l/mr1/release/r2/L1l000164, origin/android/l/mr1/release/r2/L1l000156, origin/android/l/mr1/release/r2/L1l000148, origin/android/l/mr1/release/r2/L1l000145, origin/android/l/mr1/release/r2/L1l000142, origin/android/l/mr1/release/r2/L1l000139, origin/android/l/mr1/release/r1/L1R101790, origin/android/l/mr1/release/r1/L1R101780, origin/android/l/mr1/release/r1/L1R101770, origin/android/l/mr1/release/r1/L1R101760, origin/android/l/mr1/release/r1/L1R101750, origin/android/l/mr1/release/r1/L1R101740, origin/android/l/mr1/release/r1/L1R101730, origin/android/l/mr1/release/r1/L1R101721, origin/android/l/mr1/release/r1/L1R101720, origin/android/l/mr1/release/r1/L1R101710, origin/android/l/mr1/release/r1/L1R101700, origin/android/l/mr1/release/r1/L1R101690, origin/android/l/mr1/release/r1/L1R101680, origin/android/l/mr1/release/r1/L1R101670, origin/abt/topic/gmin/l-dev/mr1/graphics-gen/rebase/r2/2015/ww37.5_cj, origin/abt/topic/gmin/l-dev/mr1/graphics-gen/rebase/r2/2015/ww37.4, origin/abt/topic/gmin/l-dev/mr1/graphics-gen/rebase/r2/2015/ww37.3_cj, origin/abt/topic/gmin/l-dev/mr1/graphics-gen/rebase/r2/2015/ww36.5, origin/abt/topic/gmin/l-dev/mr1/graphics-gen/rebase/r1/2015/ww37.3_cj, origin/abt/topic/gmin/l-dev/mr1/graphics-gen/r2, origin/abt/topic/gmin/l-dev/mr1/graphics-gen/archives/r2/2015/ww39.2) [Constantin Musca]
git diff --stat origin/android/master..HEAD:
Android.mk | 12 ++-
LICENSE | 201 +++++++++++++++++++++++++++++++++++++++++++
MODULE_LICENSE_APACHE2 | 0
Makefile | 14 +++
NOTICE | 191 ++++++++++++++++++++++++++++++++++++++++
accel-calibration.c | 16 +++-
activity.c | 17 +++-
activity_event_entry.c | 18 +++-
activity_event_utils.h | 16 +++-
calibration.h | 18 +++-
common.h | 16 +++-
compass-calibration.c | 16 +++-
control.c | 16 +++-
control.h | 16 +++-
description.c | 18 +++-
description.h | 16 +++-
discovery.c | 17 +++-
entry.c | 16 +++-
enumeration.c | 16 +++-
enumeration.h | 16 +++-
filtering.c | 16 +++-
filtering.h | 16 +++-
gyro-calibration.c | 16 +++-
iio-sensors.txt | 14 +++
linux/cutils/native_handle.h | 16 ++++
linux/cutils/properties.h | 16 +++-
linux/linux/android_alarm.h | 16 ++++
linux/log.c | 16 +++-
linux/system/graphics.h | 16 ++++
linux/utils/Atomic.h | 16 +++-
linux/utils/Log.h | 16 +++-
matrix-ops.c | 16 +++-
matrix-ops.h | 16 +++-
sens.c | 16 +++-
transform.c | 16 +++-
transform.h | 16 +++-
utils.c | 16 +++-
utils.h | 16 +++-
38 files changed, 891 insertions(+), 61 deletions(-)
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-3844
Change-Id: Ie52aa811b4c42bbae74c6e8cbd0ee23f3d490eb2
Signed-off-by: Viorel Suman <viorel.suman@intel.com>
OSDN Git Service
