Merge branch 'devel/master' into tizen 89/128189/1
authorHeeyong Song <heeyong.song@samsung.com>
Mon, 8 May 2017 03:58:10 +0000 (12:58 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Mon, 8 May 2017 03:58:34 +0000 (12:58 +0900)
Change-Id: I3b04f95e1f856502def19bae04aacc6185322092


Trivial merge