From: Xavier Ducrohet <xav@android.com>
Date: Fri, 1 May 2009 00:35:21 +0000 (-0700)
Subject: merged development with conflicts....
X-Git-Tag: android-x86-2.2~1060
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3c9f052b58b1a6356ae507ff5eb0591a25f81d70;p=android-x86%2Fsdk.git

merged development with conflicts....
---

3c9f052b58b1a6356ae507ff5eb0591a25f81d70