From: The Android Open Source Project <initial-contribution@android.com>
Date: Sat, 20 Nov 2010 00:32:05 +0000 (-0800)
Subject: merge from open-source master
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=25609116fd36215e197107ae205e2152da41d09f;p=android-x86%2Fsdk.git

merge from open-source master

Change-Id: Ib80d4267e4667901e852a03da42a7f6cc418f116
---

25609116fd36215e197107ae205e2152da41d09f