From: Somin Kim <somin926.kim@samsung.com>
Date: Mon, 18 Sep 2017 04:50:41 +0000 (+0900)
Subject: Merge branch 'tizen' into tizen_4.0
X-Git-Tag: submit/tizen_4.0/20170918.061445^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dee68fd1fbd69944bf0ed57138703e742c93434d;p=platform%2Fcore%2Fapi%2Fcontext.git

Merge branch 'tizen' into tizen_4.0

* tizen:
  Version 1.0.6
  [Trigger] Add contextual_trigger feature to Context Trigger API
  [History] Add apphistory feature to Context History API
  [History] Add context history API to wearable

Change-Id: I558e0c391e3de14448d13e3c0797232c2ea62f6c
Signed-off-by: Somin Kim <somin926.kim@samsung.com>
---

dee68fd1fbd69944bf0ed57138703e742c93434d