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

merge from open-source master

Change-Id: I7b1a186d7e1d469d873d1f0a63acfa9cb404da0a
---

3c7e2b487c6a959afcd70c9d214879c0f38c919d