Merge branch 'master' into notification-service 69/9269/1
authoruzchoi <uzchoi@samsung.com>
Mon, 11 Jul 2016 02:39:29 +0000 (11:39 +0900)
committeruzchoi <uzchoi@samsung.com>
Mon, 11 Jul 2016 02:43:44 +0000 (11:43 +0900)
Change-Id: I968cfa282e3ef1e3132ea0fbe93a7098115c7193
Signed-off-by: uzchoi <uzchoi@samsung.com>
1  2 
.gitignore
service/SConscript

diff --cc .gitignore
Simple merge
Simple merge