Merge branch 'devel/master' into tizen
authordongsug.song <dongsug.song@samsung.com>
Wed, 21 Jun 2017 01:44:19 +0000 (10:44 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Wed, 21 Jun 2017 01:46:34 +0000 (10:46 +0900)
Change-Id: I8d229a984d252750911dc6545b9c9c103f7636e6


Trivial merge