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

merge from open-source master

Change-Id: I94c5a64731eff54534bd729ee8cdd3437da524ca
---

aaa6e06a95e46f7975e01fd5c145a9d6b29c1639