From: The Android Open Source Project <initial-contribution@android.com>
Date: Mon, 21 Jun 2010 18:23:45 +0000 (-0700)
Subject: merge from froyo-plus-aosp
X-Git-Tag: android-x86-4.4-r1~8488^2~2196
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ecfae4c86a094c27ea004a4d759e4578614078a0;p=android-x86%2Fframeworks-native.git

merge from froyo-plus-aosp

Change-Id: I36dd4460cae6e3212d724e70ff1091cb791670cd
---

ecfae4c86a094c27ea004a4d759e4578614078a0