projects / platform / core / api / context.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe77271 213da87)
Merge branch 'tizen' into tizen_4.0 98/150598/1 accepted/tizen/4.0/unified/20170920.081611 submit/tizen_4.0/20170918.061445
authorSomin Kim <somin926.kim@samsung.com>
Mon, 18 Sep 2017 04:50:41 +0000 (13:50 +0900)
committerSomin Kim <somin926.kim@samsung.com>
Mon, 18 Sep 2017 04:50:56 +0000 (13:50 +0900)
* 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>

Trivial merge
Domain: Service Framework / Context;