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

merge from open-source master

Change-Id: Icfea37187b764698744b97ebdaa74d56b4a38cdb
---

2784eab7e87e6c71b16fcc7749c896d1cdff597d