From: The Android Open Source Project <initial-contribution@android.com>
Date: Wed, 10 Nov 2010 18:45:58 +0000 (-0800)
Subject: merge from open-source master
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e19de6ee42b86f7a07591541e10c7295e219b614;p=android-x86%2Fsdk.git

merge from open-source master

Change-Id: I7f45f71c41479346fe109b0a71ee1f7549d3ceda
---

e19de6ee42b86f7a07591541e10c7295e219b614