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

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