From: The Android Automerger <android-build@android.com>
Date: Fri, 8 Jul 2011 21:11:09 +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
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=30a9965c02220cce341d634cde6487a2d64e461c;p=android-x86%2Fpackages-apps-Settings.git

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

30a9965c02220cce341d634cde6487a2d64e461c