From: Jason Sams <jsams@google.com>
Date: Fri, 10 Feb 2012 23:27:26 +0000 (-0800)
Subject: resolved conflicts for merge of cb66aec0 to graphics-dev
X-Git-Tag: android-x86-4.4-r1~1658
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2fbcc399eaac8ccae99bc8fe1a62a271a935c1ab;p=android-x86%2Fframeworks-native.git

resolved conflicts for merge of cb66aec0 to graphics-dev

Change-Id: Ic8817f702b6993f046c89f2fc598c9fe3bf30fe8
---

2fbcc399eaac8ccae99bc8fe1a62a271a935c1ab