Merge branch 'devel/master' into tizen 92/141492/1
authorminho.sun <minho.sun@samsung.com>
Tue, 1 Aug 2017 01:00:01 +0000 (10:00 +0900)
committerminho.sun <minho.sun@samsung.com>
Tue, 1 Aug 2017 01:00:08 +0000 (10:00 +0900)
Change-Id: Ia7717724d74a848f6693842eb843170d3d41ddae


Trivial merge