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)
commit0bc12d1d342c00587f6f79087d7dbd5ee683e1f6
treec8855784611cffb4397c8234ecfa3e4c5db6716a
parent74ea79314c15767cf2b7b4180bd7a051e211cad7
parent7054a84da686b2abcd3b15667ee8fa37044c2a55
Merge branch 'devel/tizen' into tizen

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