Merge branch 'devel/master' into tizen 85/134885/1
authorHeeyong Song <heeyong.song@samsung.com>
Tue, 20 Jun 2017 07:51:13 +0000 (16:51 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Tue, 20 Jun 2017 07:51:16 +0000 (16:51 +0900)
Change-Id: I61c6723291e2e9af475e6ed454b1125936f7eebc


Trivial merge