Merge branch 'devel/master' into tizen
authordongsug.song <dongsug.song@samsung.com>
Wed, 31 May 2017 02:01:11 +0000 (11:01 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Wed, 31 May 2017 02:08:07 +0000 (11:08 +0900)
commitfd8948948eead5967a8035e5c70712b2ee9c7eaa
tree6e208e6caaf8ecd063313efbf28a7c85adecf71e
parent6293b652c0508d942b3960be416162bae40e4ae2
parent095e5704df2e615197bb32c028884c26f6738f77
Merge branch 'devel/master' into tizen

Change-Id: Ia1263d698a98e8c85cea837c4380e18c2c7dca51