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)
Change-Id: Ic6c1e099ba90cbc5b6d7f8fbd0621302c5ea5d51


Trivial merge