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)
Change-Id: Ia1263d698a98e8c85cea837c4380e18c2c7dca51


Trivial merge