From: The Android Automerger <android-build@android.com>
Date: Wed, 29 Jun 2011 13:46:29 +0000 (-0700)
Subject: merge in ics-release history after reset to master
X-Git-Tag: android-x86-4.4-r1~1745^2~102^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~1^2^2~1^2^2^2^2^2^2~1^2^2~1^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2e95ba0f2443cc50f2007383dfe5ee6297f7c2ca;p=android-x86%2Fpackages-apps-Settings.git

merge in ics-release history after reset to master
---

2e95ba0f2443cc50f2007383dfe5ee6297f7c2ca