Merge branch 'devel/master' into tizen 05/174005/1
authordongsug.song <dongsug.song@samsung.com>
Tue, 27 Mar 2018 05:48:53 +0000 (14:48 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Tue, 27 Mar 2018 05:49:32 +0000 (14:49 +0900)
Change-Id: I7da5c34b47076853506443624c7449be9a656b94


Trivial merge