Merge branch 'devel/master' into tizen 71/137171/1 accepted/tizen/unified/20170706.193951 submit/tizen/20170705.113121 submit/tizen/20170706.054645
authorJinho, Lee <jeano.lee@samsung.com>
Tue, 4 Jul 2017 13:40:38 +0000 (22:40 +0900)
committerJinho, Lee <jeano.lee@samsung.com>
Tue, 4 Jul 2017 13:40:44 +0000 (22:40 +0900)
Change-Id: I02cbb8c1741c0e69839776742c325d3e3ac018a0


Trivial merge