Merge "[ACR-694] add resource limit error code on player_create()" into tizen

author Eunhae Choi <eunhae1.choi@samsung.com>

Fri, 1 Jul 2016 07:31:52 +0000 (00:31 -0700)

committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>

Fri, 1 Jul 2016 07:31:52 +0000 (00:31 -0700)
author Eunhae Choi <eunhae1.choi@samsung.com>
Fri, 1 Jul 2016 07:31:52 +0000 (00:31 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 1 Jul 2016 07:31:52 +0000 (00:31 -0700)
diff --cc include/common/player.h

index ec7b596,b4d0947..5b1aa43

mode 100755,100644..100755
--- 1/include/common/player.h
--- 2/include/common/player.h
+++ b/include/common/player.h
diff --cc include/wearable/player.h

index 4ad3248,060b338..d8e902a

mode 100755,100644..100755
--- 1/include/wearable/player.h
--- 2/include/wearable/player.h
+++ b/include/wearable/player.h
author	Eunhae Choi <eunhae1.choi@samsung.com>
	Fri, 1 Jul 2016 07:31:52 +0000 (00:31 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Fri, 1 Jul 2016 07:31:52 +0000 (00:31 -0700)
		1	2
include/common/player.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/wearable/player.h	patch \|	diff1 \|	diff2 \|	blob \| history