Merge branch 'tizen_3.0' into tizen 25/104225/1 accepted/tizen/common/20161214.160411 accepted/tizen/ivi/20161214.015257 accepted/tizen/mobile/20161214.014717 accepted/tizen/tv/20161214.015036 accepted/tizen/unified/20170309.033301 submit/tizen/20161213.083228 submit/tizen_unified/20170308.100408
authorGilbok Lee <gilbok.lee@samsung.com>
Tue, 13 Dec 2016 01:19:09 +0000 (10:19 +0900)
committerGilbok Lee <gilbok.lee@samsung.com>
Tue, 13 Dec 2016 01:19:14 +0000 (10:19 +0900)
Change-Id: Ie8ac7c4154453987959c8c9abe03599c76bf6873


Trivial merge