From: Jean-Baptiste Queru <jbq@google.com>
Date: Wed, 29 Jul 2009 21:56:49 +0000 (-0700)
Subject: merge from donut
X-Git-Tag: android-x86-2.2~694^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=63b3027f0e1a372d6c3e8ed9c381ffa1b0012c62;p=android-x86%2Fndk.git

merge from donut
---

63b3027f0e1a372d6c3e8ed9c381ffa1b0012c62