From: Mu-Woong Lee <muwoong.lee@samsung.com>
Date: Wed, 7 Sep 2016 12:24:32 +0000 (+0900)
Subject: Merge branch 'devel/tizen_3.0' into tizen
X-Git-Tag: submit/tizen/20160907.123648^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f7ec74d29de99701d3d3b0c43f83890ef29b71e;p=platform%2Fcore%2Fcontext%2Fcontext-service.git

Merge branch 'devel/tizen_3.0' into tizen

* devel/tizen_3.0:
  Version 0.9.6
  Subscribed to battery statistics logger
  Add 'PATH' environment variable to the upgrade script
  Upgrade script
  Use modified names of keys & types' definition
  Enable MyPlace detector

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

Conflicts:
	scripts/context-service_upgrade.sh

Change-Id: I2e28d70cb0208c005d77aeced5c246e7b763aaf0
---

1f7ec74d29de99701d3d3b0c43f83890ef29b71e