Merge branch 'devel/master' into tizen 49/122349/1
authordongsug.song <dongsug.song@samsung.com>
Fri, 31 Mar 2017 05:39:37 +0000 (14:39 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Fri, 31 Mar 2017 05:39:52 +0000 (14:39 +0900)
Change-Id: I75bd460cb610260882726da0f65419a2ebc9c3ef


Trivial merge