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)
commit8c1ef2332d621b8a875e54f4e5923b83134b497a
treed1170d0a20508e2ff439e9524254466465bf42ec
parent3f5fafc7593dba091719d0400501b08154267bec
parentcb1797c519f102f12945c00dc30cf4448b7e9b01
Merge branch 'devel/master' into tizen

Change-Id: I61c6723291e2e9af475e6ed454b1125936f7eebc