Merge branch 'devel/master' into tizen 00/124000/1
authorminho.sun <minho.sun@samsung.com>
Mon, 10 Apr 2017 02:01:15 +0000 (11:01 +0900)
committerminho.sun <minho.sun@samsung.com>
Mon, 10 Apr 2017 02:01:35 +0000 (11:01 +0900)
commit7bbdb86fe6733b4341912c29ab480c2e8602b8b5
tree4ddb6e87b175788bc97638c65ef168ff230aad49
parentdd14bbe4c2f859215cb24b4f7fb8feddf9b42b39
parent5a8be21693cf3b5d251361b09220845d2fcfd8f7
Merge branch 'devel/master' into tizen

Change-Id: I374ed5468fcab45e4a158353d86e15db0263f40f