From: The Android Open Source Project <initial-contribution@android.com>
Date: Thu, 2 Dec 2010 00:06:47 +0000 (-0800)
Subject: merge from open-source master
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9f4023f3ee2f1a63ea7ad33678d235020e9729a9;p=android-x86%2Fsdk.git

merge from open-source master

Change-Id: Ifea6128a9dc6899797611782e79f549ee8b0edd7
---

9f4023f3ee2f1a63ea7ad33678d235020e9729a9