Merge branch 'devel/master' into tizen
authordongsug.song <dongsug.song@samsung.com>
Tue, 13 Jun 2017 07:44:03 +0000 (16:44 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Tue, 13 Jun 2017 07:44:12 +0000 (16:44 +0900)
Change-Id: Iaecd4c034f09c4459367edf771b002b344442163


Trivial merge