Merge commit '0b98c944c6bac98d95c93916cde31f841b44d9aa' into eclair-plus-aosp * commit '0b98c944c6bac98d95c93916cde31f841b44d9aa': Fix code placement and comments for gtalk url scraping settings.
Merge commit '0b98c944c6bac98d95c93916cde31f841b44d9aa' into eclair-plus-aosp * commit '0b98c944c6bac98d95c93916cde31f841b44d9aa': Fix code placement and comments for gtalk url scraping settings.