From: The Android Open Source Project <initial-contribution@android.com>
Date: Sat, 4 Sep 2010 00:12:30 +0000 (-0700)
Subject: merge from open-source master
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8d0607721b90af3c8eecd484bda9931655060bd4;p=android-x86%2Fsdk.git

merge from open-source master

Change-Id: I9d7eca2a536b4646767a7aa1afba2d86b865fb57
---

8d0607721b90af3c8eecd484bda9931655060bd4