Merge branch 'devel/master' into tizen 02/132002/1
authordongsug.song <dongsug.song@samsung.com>
Wed, 31 May 2017 12:48:26 +0000 (21:48 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Wed, 31 May 2017 13:04:33 +0000 (22:04 +0900)
commitb0a55f4993e6a17579b2b82157d7235f7c2b86c3
treea505a60dedfff8c6dbb77375330c24cfc3834314
parentff3214279ae379d04540544435e35f2bdf1bf477
parent9247a30faa40e11f0bdcc8adbc350bdc8b0c046c
Merge branch 'devel/master' into tizen

Change-Id: I9370117e7567f7da8666567b1715bc2cb790ddcd