Merge branch 'devel/master' into tizen 11/113811/1
authorminho.sun <minho.sun@samsung.com>
Thu, 9 Feb 2017 02:19:29 +0000 (11:19 +0900)
committerminho.sun <minho.sun@samsung.com>
Thu, 9 Feb 2017 02:19:59 +0000 (11:19 +0900)
commitfdf6aad7d4aaaa0051a10b0324058dad8a401bc3
tree12409535d314e05f363dc75fa5920e2e9d039ae7
parent07157c084e3dba5302cfbb98176fe621bc994be1
parent6630638215878dbd545843c0956c480833cf8be7
Merge branch 'devel/master' into tizen

Change-Id: Ic6c1e099ba90cbc5b6d7f8fbd0621302c5ea5d51