OSDN Git Service

Merge remote-tracking branch 'origin/android/master'
authorViorel Suman <viorel.suman@intel.com>
Thu, 24 Sep 2015 08:23:13 +0000 (11:23 +0300)
committerViorel Suman <viorel.suman@intel.com>
Thu, 24 Sep 2015 08:50:52 +0000 (11:50 +0300)
commit392a6b41be22b2f8106ef4b1bda6557239a31b5a
tree46be322530d888bd3236d37f6dfad53f5658c73e
parentcda77fa4f1de5197c40d1845a382f9abaa4818a4
parenta6149785a5ae048ce721d0cbed91c173b902d858
Merge remote-tracking branch 'origin/android/master'

git log --pretty=format:"%h %ad | %s%d [%an]" origin/android/l/mr1/master..origin/android/master:
  a614978 Mon Sep 7 17:27:17 2015 +0300 | Increase limit of trigger names to 64 characters (origin/feature/m_mr0/trusty, origin/feature/m_mr0/gfx_gen/rebase/r2/2015/ww38.2, origin/feature/m_mr0/gfx_gen/rebase/r1/2015/ww38.3_cj, origin/feature/m_mr0/gfx_gen/rebase/r1/2015/ww38.2_cj, origin/feature/m_mr0/gfx_gen/r2, origin/feature/m_mr0/camera/master, origin/feature/m_mr0/art/release/2015-WW38, origin/feature/m_mr0/art/master, origin/android/master, origin/android/m/mm/release/r1/MMR100230, origin/android/m/mm/release/r1/MMR100220, origin/android/m/mm/release/r1/MMR100210, origin/android/m/mm/release/r1/MMR100200, origin/android/m/mm/release/r1/MMR100190, origin/android/m/mm/release/r1/MMR100180, origin/android/m/mm/release/r1/MMR100170, origin/android/m/mm/release/r1/MMR100160, origin/android/candidates/mergerequest/master-r2, origin/android/candidates/mergerequest/master-r1) [Mihai Serban]
  6dd7dd1 Tue Aug 11 15:18:12 2015 +0000 | Merge branch e35fc5677585eb789efb5c02e2de084fbedcd67d into android/master (origin/feature/m_mr0/gfx_gen/rebase/r2/2015/ww37.2, origin/feature/m_mr0/gfx_gen/rebase/r1/2015/ww37.2, origin/feature/m_mr0/gfx_gen/rebase/r1/2015/ww35.4, origin/feature/m_mr0/gfx_gen/rebase/r1/2015/ww34.1, origin/feature/m_mr0/gfx_gen/r1, origin/feature/m_mr0/gfx_gen/archives/r2/2015/ww37.2, origin/feature/m_mr0/gfx_gen/archives/r1/2015/ww38.2, origin/feature/m_mr0/gfx_gen/archives/r1/2015/ww37.2_cj, origin/feature/m_mr0/gfx_gen/archives/r1/2015/ww37.2, origin/feature/m_mr0/gfx_gen/archives/r1/2015/ww36.1, origin/feature/m_mr0/gfx_gen/archives/r1/2015/WW35.3, origin/feature/m_mr0/art/release/2015-WW37, origin/feature/m_mr0/art/release/2015-WW36, origin/cas/integ/cas_tech, origin/android/masterM0R1TEST00019, origin/android/m/mr0/release/r1/M0R1TEST00019, origin/android/m/mr0/release/r1/M0R100009, origin/android/m/mm/release/r1/MMR100150, origin/android/m/mm/release/r1/MMR100140, origin/android/m/mm/release/r1/MMR100130, origin/android/m/mm/release/r1/MMR100120, origin/android/m/mm/release/r1/MMR100110, origin/android/m/mm/release/r1/MMR100100, origin/android/m/mm/release/r1/MMR100090, origin/android/m/mm/release/r1/MMR100080, origin/android/m/mm/release/r1/MMR100070, origin/android/m/mm/release/r1/MMR100060, origin/android/m/mm/release/r1/MMR100050, origin/android/m/mm/release/r1/MMR100040, origin/android/m/mm/release/r1/MMR100030, origin/android/m/mm/release/r1/MMR100020, origin/android/m/mm/release/r1/MMR100010, origin/android/m/mm/release/r1/MMR100009, origin/abt/private/topic/gmin/art-optim/staging/oam, origin/abt/private/topic/gmin/art-optim/release/staging/oam/2015-WW36, origin/abt/private/topic/gmin/art-optim/release/staging/oam/2015-WW35, origin/abt/private/topic/gmin/art-optim/release/staging/oam/2015-WW34a, origin/abt/private/topic/gmin/art-optim/release/staging/oam/2015-WW34) [buildslave]
  b220959 Mon Aug 3 10:28:11 2015 +0200 | add missing includes (origin/feature/m_mr0/gfx_gen/rebase/r1/2015/ww32.5, origin/feature/m_mr0/gfx_gen/archives/r1/2015/ww34.1, origin/feature/m_mr0/gfx_gen/archives/r1/2015/ww32.5, origin/abt/topic/gmin/l-dev/graphics-gen/rebase/2015/ww32.1, origin/abt/topic/gmin/l-dev/graphics-gen/r1, origin/abt/private/topic/gmin/art-optim/release/staging/oam/2015-WW33, origin/abt/private/topic/gmin/art-optim/release/staging/oam/2015-WW32) [christophe.continente]
  b27955f Fri Jul 24 18:51:09 2015 -0700 | Fix 64bit builds on master (origin/abt/private/topic/gmin/art-optim/release/staging/oam/2015-WW31a, origin/abt/private/topic/gmin/art-optim/release/staging/oam/2015-WW31) [Ganesh Mahalingam]
  07118de Wed Jul 22 13:00:13 2015 +0000 | Merge branch ab9bfb48e9c9aa0d4d0e182a8b7f78f8cae27e42 into android/master [buildslave]
  d9b3154 Tue May 5 01:05:40 2015 -0700 | Add errno includes (origin/android/m/topic/aosp/pdk, origin/android/m/topic/aosp/master, origin/android/m/mr0/release/r1/M0R1TEST00009, origin/android/m/mr0/master, origin/abt/topic/gmin/l-dev/graphics-gen/archives/2015/ww32.1, origin/abt/topic/gmin/l-dev/graphics-gen/archives/2015/ww29.4, origin/abt/private/topic/gmin/art-optim/staging/oam-rebase, origin/abt/private/topic/gmin/art-optim/staging/oam-dev, origin/abt/private/topic/gmin/art-optim/release/staging/oam/2015-WW29, origin/abt/private/topic/gmin/art-optim/release/staging/oam/2015-WW28, origin/abt/private/topic/gmin/art-optim/release/staging/oam/2015-WW27, origin/abt/private/topic/gmin/art-optim/release/staging/oam-dev/WW28) [Axel Fagerstedt]

git diff --stat origin/android/l/mr1/master..HEAD:
  common.h | 4 +++-
  sens.c   | 1 +
  2 files changed, 4 insertions(+), 1 deletion(-)

Tracked-On: https://jira01.devtools.intel.com/browse/GMINL-18956
Change-Id: I3e022365c3e5c22e72a494b2f848dcb53313ed9f
Signed-off-by: Viorel Suman <viorel.suman@intel.com>
common.h
sens.c