am 40683904: am 5f3cd3ea: Merge "Associated changes for \'Adding sample for collection widgets backed by content providers.\'" into honeycomb

* commit '4068390434c366b814dc0885ae5ef5fc0cf50eff':
  Associated changes for 'Adding sample for collection widgets backed by content providers.'

Android.mk

@@ -432,6 +432,8 @@ web_docs_sample_code_flags := \
 		            resources/samples/TicTacToeLib "TicTacToeLib" \
 		-samplecode $(sample_dir)/TicTacToeMain \
 		            resources/samples/TicTacToeMain "TicTacToeMain" \
+		-samplecode $(sample_dir)/WeatherListWidget \
+		            resources/samples/WeatherListWidget "Weather List Widget Sample" \
 		-samplecode $(sample_dir)/Wiktionary \
 		            resources/samples/Wiktionary "Wiktionary" \
 		-samplecode $(sample_dir)/WiktionarySimple \

docs/html/resources/resources-data.js

@@ -604,6 +604,16 @@ var ANDROID_RESOURCES = [
       en: 'A simple Android home screen widgets example.'
     }
   },
+  {
+    tags: ['sample', 'widgets', 'newfeature', 'new'],
+    path: 'samples/WeatherListWidget/index.html',
+    title: {
+      en: 'Weather List Widget Sample'
+    },
+    description: {
+      en: 'A more complex collection-widget example which uses a ContentProvider as its data source.'
+    }
+  },
   {
     tags: ['sample', 'layout'],
     path: 'samples/XmlAdapters/index.html',