Merge "Bug 2673557: rename datamessaging" into froyo