diff --git a/Android.mk b/Android.mk
index 83c4b5b1fe4e6..b7ea2549e19db 100644
--- a/Android.mk
+++ b/Android.mk
@@ -443,6 +443,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 \
diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js
index 0b82aeeba3de8..fb4225dc8a2d3 100644
--- a/docs/html/resources/resources-data.js
+++ b/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',
diff --git a/docs/html/resources/samples/images/KeyChainDemo1.png b/docs/html/resources/samples/images/KeyChainDemo1.png
new file mode 100644
index 0000000000000..d426c225a45e4
Binary files /dev/null and b/docs/html/resources/samples/images/KeyChainDemo1.png differ
diff --git a/docs/html/resources/samples/images/KeyChainDemo2.png b/docs/html/resources/samples/images/KeyChainDemo2.png
new file mode 100755
index 0000000000000..e181e5877a5e0
Binary files /dev/null and b/docs/html/resources/samples/images/KeyChainDemo2.png differ
diff --git a/docs/html/resources/samples/images/KeyChainDemo3.png b/docs/html/resources/samples/images/KeyChainDemo3.png
new file mode 100755
index 0000000000000..acfdd89f1a072
Binary files /dev/null and b/docs/html/resources/samples/images/KeyChainDemo3.png differ
diff --git a/docs/html/resources/samples/images/KeyChainDemo4.png b/docs/html/resources/samples/images/KeyChainDemo4.png
new file mode 100755
index 0000000000000..a9101abaee61a
Binary files /dev/null and b/docs/html/resources/samples/images/KeyChainDemo4.png differ