am 3e360000: am 53c0c0da: Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo
am 3e360000: am 53c0c0da: Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo

Merge commit '3e360000fcb1cc60d8786d1340f9a468014c6435' into kraken

* commit '3e360000fcb1cc60d8786d1340f9a468014c6435':
  Fix (again) for bug 2558156, update cache encoding correctly

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base