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

Merge commit '8dcdac6beda22d063838a2bc43575ec9d1e5c494'

* commit '8dcdac6beda22d063838a2bc43575ec9d1e5c494':
  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