Merge commit '691b806ff8b4a6428588e8495cb1a5819a0aee99' into froyo-plus-aosp * commit '691b806ff8b4a6428588e8495cb1a5819a0aee99': Fix possible security issue.
Merge commit '691b806ff8b4a6428588e8495cb1a5819a0aee99' into froyo-plus-aosp * commit '691b806ff8b4a6428588e8495cb1a5819a0aee99': Fix possible security issue.