From: Jean-Baptiste Queru <jbq@google.com>
Date: Thu, 3 Sep 2009 21:12:47 +0000 (-0700)
Subject: merge from donut
X-Git-Tag: android-x86-1.6~4
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevelopment.git;a=commitdiff_plain;h=4b4bcaf08c001dd09c7fcb40a1ef7e4affa2639e

merge from donut
---

4b4bcaf08c001dd09c7fcb40a1ef7e4affa2639e