projects / platform / core / context / context-provider.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 98532e1 bc44185)
Merge branch 'devel/tizen' into tizen 27/124727/1 accepted/tizen/unified/20170414.163524 submit/tizen/20170413.031950 tizen_4.0.m1_release
authorMu-Woong Lee <muwoong.lee@samsung.com>
Wed, 12 Apr 2017 08:03:27 +0000 (17:03 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Wed, 12 Apr 2017 08:03:27 +0000 (17:03 +0900)
* devel/tizen:
  Enable the legacy app/social stats providers
  Disable WiFi context provider
  Modified secure log macro
  Remove a redundant member variable from message.h
  Integrate the legacy context-common code and headers (2/2)
  Integrate the legacy context-common code and headers (1/2)

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

Trivial merge
Domain: Service Framework / Context;