am af71f32: am 2963ae3: am 4ddfaeb: Merge "sdk doc change: Added KeyChain API Demo" into ics-mr1

* commit 'af71f328e6b03cc6b7111b87b625c3f9cb3987e4':
  sdk doc change: Added KeyChain API Demo

Author: Tony Chan

Android.mk

@@ -441,6 +441,8 @@ web_docs_sample_code_flags := \
 		            resources/samples/HoneycombGallery "Honeycomb Gallery" \
 		-samplecode $(sample_dir)/JetBoy \
 		            resources/samples/JetBoy "JetBoy" \
+		-samplecode $(sample_dir)/KeyChainDemo \
+		            resources/samples/KeyChainDemo "KeyChain Demo" \
 		-samplecode $(sample_dir)/LunarLander \
 		            resources/samples/LunarLander "Lunar Lander" \
 		-samplecode $(sample_dir)/training/ads-and-ux \

docs/html/resources/resources-data.js

@@ -558,6 +558,16 @@ var ANDROID_RESOURCES = [
       en: 'A game that demonstrates the SONiVOX JET interactive music technology, with <code><a href="/reference/android/media/JetPlayer.html">JetPlayer</a></code>.'
     }
   },
+  {
+    tags: ['sample', 'new'],
+    path: 'samples/KeyChainDemo/index.html',
+    title: {
+      en: 'KeyChain Demo'
+    },
+    description: {
+      en: 'A demo application to demonstrate how to use KeyChain APIs.'
+    }
+  },
   {
     tags: ['sample', 'gamedev', 'media'],
     path: 'samples/LunarLander/index.html',