Merge branch 'devel/master' into tizen 70/137170/1 accepted/tizen/unified/20170706.193941 submit/tizen/20170705.113121 submit/tizen/20170706.054645
authorJinho, Lee <jeano.lee@samsung.com>
Tue, 4 Jul 2017 05:53:51 +0000 (14:53 +0900)
committerJinho, Lee <jeano.lee@samsung.com>
Tue, 4 Jul 2017 06:01:57 +0000 (15:01 +0900)
Change-Id: I467bb25b8bb25bdaf5d69372e8815a2d9504f17c


Trivial merge