4ba57a4e0a
Merge commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a' into froyo-plus-aosp * commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a': Fix for bug 2558156: Encodig is null