From: jihye424.kim <jihye424.kim@samsung.com>
Date: Mon, 27 Jun 2016 08:28:09 +0000 (+0900)
Subject: Merge branch 'develop' into tizen_2.3.2
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~37
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84eeb577b791d77c0f42117f328462a43f320957;p=sdk%2Femulator%2Fqemu.git

Merge branch 'develop' into tizen_2.3.2

Conflicts:
	package/pkginfo.manifest

Change-Id: I4df3139ea87076a069841a12624f7cd67c1c635f
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>
---

84eeb577b791d77c0f42117f328462a43f320957