Merge branch 'tizen' into tizen_3.0 85/103285/1
authorGeunsun, Lee <gs86.lee@samsung.com>
Thu, 8 Dec 2016 02:47:57 +0000 (11:47 +0900)
committerGeunsun, Lee <gs86.lee@samsung.com>
Thu, 8 Dec 2016 02:48:20 +0000 (11:48 +0900)
Change-Id: I04173b23ed03a76516e028b5d4438927ce8bce5d


Trivial merge