Merge branch 'devel/master' into tizen 12/113812/1
authorminho.sun <minho.sun@samsung.com>
Thu, 9 Feb 2017 02:23:04 +0000 (11:23 +0900)
committerminho.sun <minho.sun@samsung.com>
Thu, 9 Feb 2017 02:23:49 +0000 (11:23 +0900)
Change-Id: I6947f0c77b5e9925ad966bc8d7004d8a72ba61dd


Trivial merge