From: Stanislav Vorobiov <s.vorobiov@samsung.com>
Date: Thu, 20 Feb 2014 08:15:56 +0000 (+0400)
Subject: Merge branch 'tizen' into glesv3
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~475^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F45%2F16645%2F1;p=sdk%2Femulator%2Fqemu.git

Merge branch 'tizen' into glesv3

Change-Id: I69a1dd3c0cbbea7b7fd19e86e6c726feb785c1cb
---

f0cb9afbb88384291fa1e5b7f2de0cc7b3e5f8e1