Merge "framework/base changes to add new voicemail provider sample."

Android.mk

@@ -437,6 +437,8 @@ web_docs_sample_code_flags := \
 		            resources/samples/WiktionarySimple "Wiktionary (Simplified)" \
 		-samplecode $(sample_dir)/VoiceRecognitionService \
 		            resources/samples/VoiceRecognitionService "Voice Recognition Service" \
+		-samplecode $(sample_dir)/VoicemailProviderDemo \
+		            resources/samples/VoicemailProviderDemo "Voicemail Provider Demo" \
 		-samplecode $(sample_dir)/XmlAdapters \
 		            resources/samples/XmlAdapters "XML Adapters"
 

docs/html/resources/resources-data.js

@@ -625,6 +625,16 @@ var ANDROID_RESOURCES = [
       en: 'A set of samples that demonstrate how to use various features of the USB APIs.'
     }
   },
+  {
+    tags: ['sample', 'data', 'new'],
+    path: 'samples/VoicemailProviderDemo/index.html',
+    title: {
+      en: 'Voicemail Provider Demo'
+    },
+    description: {
+      en: 'A sample application to demonstrate how to use voicemail content provider APIs.'
+    }
+  },
   {
     tags: ['sample', 'ui', 'widgets'],
     path: 'samples/Wiktionary/index.html',