From: Romain Guy <romainguy@google.com>
Date: Fri, 22 Jul 2011 23:46:59 +0000 (-0700)
Subject: Merge "Fix the build"
X-Git-Tag: android-x86-4.4-r1~5709
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=164b7a466f1f169cad13103ba40db25f7b5cf021;p=android-x86%2Fframeworks-native.git

Merge "Fix the build"
---

164b7a466f1f169cad13103ba40db25f7b5cf021