projects / platform / core / context / context-provider.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce6f71f ffeaef0)
Merge branch 'devel/tizen_3.0' into tizen 35/58735/1 accepted/tizen/mobile/20160203.102649 accepted/tizen/tv/20160203.102719 accepted/tizen/wearable/20160203.102750 submit/tizen/20160203.071616
authorMu-Woong Lee <muwoong.lee@samsung.com>
Wed, 3 Feb 2016 06:57:53 +0000 (15:57 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Wed, 3 Feb 2016 06:57:53 +0000 (15:57 +0900)
* devel/tizen_3.0:
  Version 0.7.1
  statistics: modify foregroun app monitor to run in two-phases
  [prediction] for brackets {} convention apply.
  [prediction] #ifndef _<PROJECT>_<FILE>_H_ convention apply.
  Update enum names of contacts-service, which are modified

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

Trivial merge
Domain: Service Framework / Context;