Merge branch 'devel/master' into tizen 98/128198/1
authorHeeyong Song <heeyong.song@samsung.com>
Mon, 8 May 2017 04:14:40 +0000 (13:14 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Mon, 8 May 2017 04:14:48 +0000 (13:14 +0900)
Change-Id: I0975d086de1558c523667665c9dff82af6af1908


Trivial merge