From: Mu-Woong Lee <muwoong.lee@samsung.com>
Date: Tue, 28 Jun 2016 01:18:14 +0000 (+0900)
Subject: Merge branch 'devel/tizen_3.0' into tizen
X-Git-Tag: submit/tizen/20160628.050740^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F03%2F76903%2F1;p=platform%2Fcore%2Fcontext%2Fcontext-provider.git

Merge branch 'devel/tizen_3.0' into tizen

* devel/tizen_3.0:
  Disable app usage logging on Wearable profile
  custom: fix the package id json key
  wifi: wifi monitoring is not initiated automatically
  Add sensor recorder provides (pedometer & pressure supported)
  Remove ProviderTypes.h

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

3c6132fd6df368fcedc20acaa651ce6f8b722387