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)
commitda01b82cc005cd39fcb64ab4316a290605ec40df
tree6414f82b8dc6ea9b3ff95cc90db7903b8358174e
parentecd23209f31cb87e989e32a414ccd9586e21c332
parentf2bbea8b404d188528cbfcef0b40e7b7d9017f58
Merge branch 'master' into tizen

Change-Id: Ie83044d82e9772c3ec094a5d162cacffe4d7b9a1
Signed-off-by: taeyoung <ty317.kim@samsung.com>