From: Jinhyung Choi <jinhyung2.choi@samsung.com>
Date: Fri, 27 Mar 2015 06:52:32 +0000 (+0900)
Subject: Merge branch 'tizen_2.3' into tizen_2.4
X-Git-Tag: submit/tizen/20150527.025434^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=694075c155f22e4de92961ddc998aaeab5c6810c;p=platform%2Fadaptation%2Femulator%2Femulator-daemon.git

Merge branch 'tizen_2.3' into tizen_2.4

Change-Id: Ic97fe0de9bb44f595075be4d79ede8020028a3c4
Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>
---

694075c155f22e4de92961ddc998aaeab5c6810c