am 9a7ef33b: am 1ecf192c: bug 2236535: find a way to update the stale canonical_addresses entries with new SMS/MMS number.

Merge commit '9a7ef33bd932bf8a1bbe4423b1746fcb9c540e35' into eclair-mr2-plus-aosp

* commit '9a7ef33bd932bf8a1bbe4423b1746fcb9c540e35':
  bug 2236535: find a way to update the stale canonical_addresses entries with new SMS/MMS number.
tree: b620f0cb4e9f8ba0ed2f5a45a05703790fbd498e
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE