From: The Android Automerger <android-build@android.com>
Date: Thu, 18 Aug 2011 13:34:09 +0000 (-0700)
Subject: merge in ics-release history after reset to master
X-Git-Tag: android-x86-4.4-r1~1579^2~446^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~1^2^2^2^2~2^2^2^2^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=adb7d71831b85d5157ad64ec607821ebdfabfc65;p=android-x86%2Fframeworks-av.git

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

adb7d71831b85d5157ad64ec607821ebdfabfc65