projects / platform / core / context / context-service.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebb7227 c11e3e4)
Merge branch 'devel/tizen_3.0' into tizen 28/76328/1 accepted/tizen/common/20160627.191157 accepted/tizen/ivi/20160623.121120 accepted/tizen/mobile/20160623.121024 accepted/tizen/wearable/20160623.121106 submit/tizen/20160622.045445
authorMu-Woong Lee <muwoong.lee@samsung.com>
Thu, 23 Jun 2016 11:19:01 +0000 (20:19 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Thu, 23 Jun 2016 11:19:01 +0000 (20:19 +0900)
* devel/tizen_3.0:
  Modified trigger table, column names as camel case
  Re-establish custom provider - Policy manager subscribes custom manager

Change-Id: Icdfd40a65dc83fec1a6c3223dd15571a5f7a9ba5
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

Trivial merge
Domain: Service Framework / Context;