Merge branch 'devel/master' into tizen 99/113799/1
authorminho.sun <minho.sun@samsung.com>
Thu, 9 Feb 2017 02:01:40 +0000 (11:01 +0900)
committerminho.sun <minho.sun@samsung.com>
Thu, 9 Feb 2017 02:02:12 +0000 (11:02 +0900)
Change-Id: Ic0efa13c9bac0d276dbcbab45df338446fa8d83a


Trivial merge