Merge branch 'tizen' into tizen_3.0 95/97795/1 accepted/tizen/3.0/common/20161116.144023 accepted/tizen/3.0/ivi/20161116.023416 accepted/tizen/3.0/mobile/20161116.022903 accepted/tizen/3.0/tv/20161116.023015 accepted/tizen/3.0/wearable/20161116.023312 submit/tizen_3.0/20161115.060306
authorJeongmo Yang <jm80.yang@samsung.com>
Tue, 15 Nov 2016 05:17:42 +0000 (14:17 +0900)
committerJeongmo Yang <jm80.yang@samsung.com>
Tue, 15 Nov 2016 05:17:42 +0000 (14:17 +0900)
commit1ed02daf8aae544c0c7432ae376e21dc24d35ec0
tree715320e574923444283dfc676a3b028fafd17167
parent4d77e3064054f66aeeb13cef44ff9da28ae56b9d
parent544d65bec2926ba6c890d06d9fb47156bf9d6317
Merge branch 'tizen' into tizen_3.0

Conflicts:
packaging/mmfw-sysconf.spec

Change-Id: Ie71759b283cc815dc8f7068310192e9887601d20
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>