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

merge from open-source master

Change-Id: I94b7bb82473b1d4fcb5439d8e6e478b50d83c00f
---

ec54e858e38126b494b977927fa4d8e8a15ee1b3