Merge "[Preference] -part of the API implemented" into tizen_3.0

author HyunJin Park <hj.na.park@samsung.com>

Thu, 14 Apr 2016 08:31:34 +0000 (17:31 +0900)

committer Gerrit Code Review <gerrit@s001>

Thu, 14 Apr 2016 08:31:35 +0000 (17:31 +0900)
author HyunJin Park <hj.na.park@samsung.com>
Thu, 14 Apr 2016 08:31:34 +0000 (17:31 +0900)
committer Gerrit Code Review <gerrit@s001>
Thu, 14 Apr 2016 08:31:35 +0000 (17:31 +0900)
diff --cc packaging/webapi-plugins.spec
Simple merge
diff --cc src/tizen-wrt.gyp
Simple merge
author	HyunJin Park <hj.na.park@samsung.com>
	Thu, 14 Apr 2016 08:31:34 +0000 (17:31 +0900)
committer	Gerrit Code Review <gerrit@s001>
	Thu, 14 Apr 2016 08:31:35 +0000 (17:31 +0900)
		1	2
packaging/webapi-plugins.spec	patch \|	diff1 \|	diff2 \|	blob \| history
src/tizen-wrt.gyp	patch \|	diff1 \|	diff2 \|	blob \| history