From: Mu-Woong Lee <muwoong.lee@samsung.com>
Date: Wed, 3 Feb 2016 06:57:53 +0000 (+0900)
Subject: Merge branch 'devel/tizen_3.0' into tizen
X-Git-Tag: accepted/tizen/mobile/20160203.102649^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=914dd7bdaec76262a1492b5249b36267621b0b72;p=platform%2Fcore%2Fcontext%2Fcontext-provider.git

Merge branch 'devel/tizen_3.0' into tizen

* 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>
---

914dd7bdaec76262a1492b5249b36267621b0b72