Merge branch 'devel/tizen' into tizen 83/182983/1 accepted/tizen/unified/20180702.062919 submit/tizen/20180629.102941
authorkibak.yoon <kibak.yoon@samsung.com>
Fri, 29 Jun 2018 08:59:25 +0000 (17:59 +0900)
committerkibak.yoon <kibak.yoon@samsung.com>
Fri, 29 Jun 2018 09:52:11 +0000 (18:52 +0900)
* devel/tizen:
  Fix upgrade script for sensor recorder
  Remove context-store feature
  500.context-service.sh: Use four-digit version

Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>
Change-Id: Ifa0ba7eb124df5fe2a52ee4734eedbe45cb7dc0d


Trivial merge