Merge commit '53c0c0daf42ca69163fdc1233b3eaca7e382783f' into froyo-plus-aosp * commit '53c0c0daf42ca69163fdc1233b3eaca7e382783f': Fix (again) for bug 2558156, update cache encoding correctly
Merge commit '53c0c0daf42ca69163fdc1233b3eaca7e382783f' into froyo-plus-aosp * commit '53c0c0daf42ca69163fdc1233b3eaca7e382783f': Fix (again) for bug 2558156, update cache encoding correctly