Merge branch 'devel/master' into tizen
authorminho.sun <minho.sun@samsung.com>
Tue, 1 Aug 2017 01:21:45 +0000 (10:21 +0900)
committerminho.sun <minho.sun@samsung.com>
Tue, 1 Aug 2017 01:21:50 +0000 (10:21 +0900)
commitb7023e85022f6250d042fe1f0fc5881d4f52e8fe
tree0bc71a0d4608403093a0c354b1eaec2a09aa8e62
parent25add895b2f323c30e67d334ffb37dabccf0338f
parente1a151c89b5f15a4c2622e8ccf8e0ebda58458fb
Merge branch 'devel/master' into tizen

Change-Id: I2309c780f031cd7c714d70b66105cb258e8fe5c3
.gitignore