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)
Change-Id: I2309c780f031cd7c714d70b66105cb258e8fe5c3

1  2 
.gitignore

diff --cc .gitignore
index 953cfc3,3a33512..3a33512
mode 100755,100644..100755