From: Jean-Baptiste Queru <jbq@google.com>
Date: Tue, 14 Feb 2012 17:57:28 +0000 (-0800)
Subject: Merge from master
X-Git-Tag: android-x86-4.4-r1~1588
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a9360fa5f64add5eb8e3276f0d8191141a4ec230;p=android-x86%2Fframeworks-native.git

Merge from master

Change-Id: Ib9bc82ee0517945c5a713692d748042601d406ef
---

a9360fa5f64add5eb8e3276f0d8191141a4ec230