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)
commitc0162c4bc97e711fe133cc623591cfb808566f65
tree68006e8d1e4ecaeef08137fbe08f955ec7921f0f
parent98438588ab9e544565ba75c29fea6c0fa945a8ec
parent98e9ef8d5dfb62ab93985dddf8847540ac217d98
Merge branch 'devel/master' into tizen

Change-Id: Ic0efa13c9bac0d276dbcbab45df338446fa8d83a