Merge branch 'tizen' into tizen_3.0 37/103737/1 submit/tizen_3.0/20161209.085143
authorGeunsun, Lee <gs86.lee@samsung.com>
Fri, 9 Dec 2016 08:48:13 +0000 (17:48 +0900)
committerGeunsun, Lee <gs86.lee@samsung.com>
Fri, 9 Dec 2016 08:48:53 +0000 (17:48 +0900)
Change-Id: I4a386949ba59d1db69707280f174c7f0e0fb5cba


Trivial merge