Merge branch 'devel/master' into tizen
authordongsug.song <dongsug.song@samsung.com>
Wed, 21 Jun 2017 05:40:25 +0000 (14:40 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Wed, 21 Jun 2017 05:40:57 +0000 (14:40 +0900)
Change-Id: I478e94cbfc77bd762f85d6b3ec7b03350c7ee192


Trivial merge