From: The Android Open Source Project <initial-contribution@android.com>
Date: Fri, 25 Jun 2010 17:02:14 +0000 (-0700)
Subject: merge from froyo-plus-aosp
X-Git-Tag: android-x86-4.4-r1~2817^2~122
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c9d2f15fc5012066b62f5a59aff5c7aaf283c491;p=android-x86%2Fpackages-apps-Settings.git

merge from froyo-plus-aosp

Change-Id: I006987d370377a0222dfc5b4cb24ad6441d717dc
---

c9d2f15fc5012066b62f5a59aff5c7aaf283c491