From: jihye1128.kim <jihye1128.kim@samsung.com>
Date: Thu, 18 Apr 2013 02:53:25 +0000 (+0900)
Subject: Merge branch 'master' into tizen_2.1
X-Git-Tag: submit/tizen/20150527.025720~3^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=276af9812b4926978ad0da6d17c0f532860ddf86;p=platform%2Fadaptation%2Femulator%2Fdevice-manager-plugin-emul.git

Merge branch 'master' into tizen_2.1

Conflicts:
	include/devman_define_node_path.h
	include/devman_plugin_intf.h
	packaging/device-manager-plugin-maru.spec
	src/device_manager_io.c
	src/device_manager_plugin_maru.c
---

276af9812b4926978ad0da6d17c0f532860ddf86