From: The Android Open Source Project <initial-contribution@android.com>
Date: Tue, 5 Oct 2010 18:20:13 +0000 (-0700)
Subject: merge from open-source master
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=646d43e9a98a77b5f77adcbe62264a02ec3380ca;p=android-x86%2Fsdk.git

merge from open-source master

Change-Id: I5db2a38f681d2168dfb801d6ad9a4a1243d3edba
---

646d43e9a98a77b5f77adcbe62264a02ec3380ca