From: Liang Qi <liang.qi@theqtcompany.com>
Date: Mon, 11 May 2015 08:01:29 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/5.5' into dev
X-Git-Tag: v5.5.90+alpha1~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=66613b4f9cada951b1f25c5d0f77bee88824c710;p=platform%2Fupstream%2Fqtmultimedia.git

Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: I0390795fa3d5f2a7ba098b514ee2da4a86e243a6
---

66613b4f9cada951b1f25c5d0f77bee88824c710