Merge branch 'devel/master' into tizen
authordongsug.song <dongsug.song@samsung.com>
Wed, 31 May 2017 10:51:16 +0000 (19:51 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Wed, 31 May 2017 12:16:08 +0000 (21:16 +0900)
Change-Id: I0b16012d4e4c302e71f44aa42bbf42c05c17ecb8


Trivial merge