do not merge
Merging change 21323 into eclair
Support pluggable vociemail number providers whose config UI can be invoked from settings
(cherry picked from commit 020c5f6f41028802d2afa0dc3ac80e41472971aa)

Conflicts:

	res/values/strings.xml
23 files changed
tree: 152324f3a15d2c5eee0cef4aef5e01554d901359
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE