From: The Android Open Source Project <initial-contribution@android.com>
Date: Fri, 20 May 2011 19:55:54 +0000 (-0700)
Subject: Reconcile with gingerbread-release
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-common.git;a=commitdiff_plain;h=430dbae68cd440d33bfebc7a038a7237cb5b274d

Reconcile with gingerbread-release

Change-Id: I18e105bceb8fcdc98c7dc412e088eb7652737e9f
---

430dbae68cd440d33bfebc7a038a7237cb5b274d