projects / platform / core / context / context-service.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74ea793 7054a84)
Merge branch 'devel/tizen' into tizen 25/124725/1 accepted/tizen/unified/20170414.163532 submit/tizen/20170413.031950
authorMu-Woong Lee <muwoong.lee@samsung.com>
Wed, 12 Apr 2017 07:59:00 +0000 (16:59 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Wed, 12 Apr 2017 07:59:00 +0000 (16:59 +0900)
This applies the newly implemented context framework service daemons.

Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>
Conflicts:
packaging/context-service.service

Change-Id: I1893080c8f3d4930a0144593820ed195eeb72491


Trivial merge
Domain: Service Framework / Context;