Merge branch 'devel/master' into tizen 28/131828/1
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)
commit74a48a46561e9b7b0d2f57a65c04e36a2bb32853
treeefa0ccff8725ad3916ef3b6c3532d9601da3bfa5
parent513950d862271acf801aa4e10446ae30d0b8b445
parent42619eae3656fc92cb0dbd811cef60016a4cabd7
Merge branch 'devel/master' into tizen

Change-Id: Ia1263d698a98e8c85cea837c4380e18c2c7dca51