am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo

Merge commit 'e2055fe4258f8085a88328579c852ec26d77bb10' into froyo-plus-aosp

* commit 'e2055fe4258f8085a88328579c852ec26d77bb10':
  Bug 2673557: rename datamessaging