From: The Android Automerger <android-build@android.com>
Date: Thu, 18 Aug 2011 13:34:52 +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
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=132fd2f23246f786f4e602c95ec005c85f362279;p=android-x86%2Fpackages-apps-Settings.git

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

132fd2f23246f786f4e602c95ec005c85f362279