Merge branch 'master' into tizen
authortaeyoung <ty317.kim@samsung.com>
Mon, 16 Jan 2017 02:39:48 +0000 (11:39 +0900)
committertaeyoung <ty317.kim@samsung.com>
Mon, 16 Jan 2017 02:42:13 +0000 (11:42 +0900)
Change-Id: Ie83044d82e9772c3ec094a5d162cacffe4d7b9a1
Signed-off-by: taeyoung <ty317.kim@samsung.com>

Trivial merge