From: The Android Open Source Project <initial-contribution@android.com>
Date: Thu, 9 Sep 2010 03:21:28 +0000 (-0700)
Subject: merge from open-source master
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=61275735d59674ddd863e44635b82324bb7c6a8a;p=android-x86%2Fsdk.git

merge from open-source master

Change-Id: I9be77e4dd63859b6679a87895f693c32128eea32
---

61275735d59674ddd863e44635b82324bb7c6a8a