From: The Android Open-Source Project <initial-contribution@android.com>
Date: Fri, 19 Aug 2011 05:08:47 +0000 (-0700)
Subject: merge from open-source master
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e3c7caf76ed6a4b468b4776712c6792de0a2afa6;p=android-x86%2Fsdk.git

merge from open-source master

Change-Id: I53dfece757737196cf3b07f9d02852897fe95ae5
---

e3c7caf76ed6a4b468b4776712c6792de0a2afa6