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)
commit914dd7bdaec76262a1492b5249b36267621b0b72
treecc09a4b9e345c7ce05c15ca85a1dd911aa3d5a68
parentce6f71fae9e8c372c34a230dfb97cefc23c75e95
parentffeaef0a9894b1d1be118ba74af3c47b86f7208a
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>