am 4ba57a4e: am 70c22a48: Merge "Fix for bug 2558156: Encodig is null" into froyo
am 4ba57a4e: am 70c22a48: Merge "Fix for bug 2558156: Encodig is null" into froyo

Merge commit '4ba57a4e0ab56126e54d5c7137cfda1d47845578' into kraken

* commit '4ba57a4e0ab56126e54d5c7137cfda1d47845578':
  Fix for bug 2558156: Encodig is null

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