Merge "[History] Add context history API to wearable" into tizen

author Somin Kim <somin926.kim@samsung.com>

Mon, 18 Sep 2017 01:07:55 +0000 (01:07 +0000)

committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>

Mon, 18 Sep 2017 01:07:55 +0000 (01:07 +0000)
author Somin Kim <somin926.kim@samsung.com>
Mon, 18 Sep 2017 01:07:55 +0000 (01:07 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Mon, 18 Sep 2017 01:07:55 +0000 (01:07 +0000)
diff --cc CMakeLists.txt
Simple merge
diff --cc include/context_history.h
Simple merge
diff --cc packaging/capi-context.spec
Simple merge
author	Somin Kim <somin926.kim@samsung.com>
	Mon, 18 Sep 2017 01:07:55 +0000 (01:07 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Mon, 18 Sep 2017 01:07:55 +0000 (01:07 +0000)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
include/context_history.h	patch \|	diff1 \|	diff2 \|	blob \| history
packaging/capi-context.spec	patch \|	diff1 \|	diff2 \|	blob \| history