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

merge from open-source master

Change-Id: Iaa8ba04a4b18c9168634aca93a47fc2dfc0a0746
---

c5cb1c97da26d99531657a26b0d64251e33bc6d4