diff --git a/Android.mk b/Android.mk
index f63cedfec8543..95bbbe6ca3eca 100644
--- a/Android.mk
+++ b/Android.mk
@@ -415,6 +415,10 @@ web_docs_sample_code_flags := \
 		            resources/samples/Spinner "Spinner" \
 		-samplecode $(sample_dir)/SpinnerTest \
 		            resources/samples/SpinnerTest "SpinnerTest" \
+		-samplecode $(sample_dir)/TicTacToeLib  \
+		            resources/samples/TicTacToeLib "TicTacToeLib" \
+		-samplecode $(sample_dir)/TicTacToeMain \
+		            resources/samples/TicTacToeMain "TicTacToeMain" \
 		-samplecode $(sample_dir)/Wiktionary \
 		            resources/samples/Wiktionary "Wiktionary" \
 		-samplecode $(sample_dir)/WiktionarySimple \
diff --git a/docs/html/resources/resources_toc.cs b/docs/html/resources/resources_toc.cs
index 7f05d301d9b12..f5a82f80069a7 100644
--- a/docs/html/resources/resources_toc.cs
+++ b/docs/html/resources/resources_toc.cs
@@ -244,6 +244,12 @@
           <li><a href="<?cs var:toroot ?>resources/samples/SpinnerTest/index.html">
                 <span class="en">SpinnerTest</span>
                 </a> <span class="new">new!</span></li>
+          <li><a href="<?cs var:toroot ?>resources/samples/TicTacToeLib/index.html">
+                <span class="en">TicTacToeLib</span>
+                </a> <span class="new">new!</span></li>
+          <li><a href="<?cs var:toroot ?>resources/samples/TicTacToeMain/index.html">
+                <span class="en">TicTacToeMain</span>
+                </a> <span class="new">new!</span></li>
           <li><a href="<?cs var:toroot ?>resources/samples/Wiktionary/index.html">
                 <span class="en">Wiktionary</span>
               </a></li>
diff --git a/docs/html/resources/samples/images/TicTacToeLib.png b/docs/html/resources/samples/images/TicTacToeLib.png
new file mode 100644
index 0000000000000..398eff38ffb43
Binary files /dev/null and b/docs/html/resources/samples/images/TicTacToeLib.png differ
diff --git a/docs/html/resources/samples/images/TicTacToeMain.png b/docs/html/resources/samples/images/TicTacToeMain.png
new file mode 100644
index 0000000000000..44cee11b9519e
Binary files /dev/null and b/docs/html/resources/samples/images/TicTacToeMain.png differ
diff --git a/docs/html/resources/samples/index.jd b/docs/html/resources/samples/index.jd
index e917495adf31b..4019200dba453 100644
--- a/docs/html/resources/samples/index.jd
+++ b/docs/html/resources/samples/index.jd
@@ -92,6 +92,22 @@ adapter).</dd>
     please read the 
     <a href="{@docRoot}resources/tutorials/testing/activity_test.html">Activity Testing</a> tutorial.
  </dd>
+ <dt><a href="TicTacToeLib/index.html">TicTacToeLib</a></dt>
+ <dd>
+    An example of an Android library project that provides a game-play
+    Activity to any dependent application project. For an example of
+    how an application can use the code and resources in an Android
+    library project, see the <a
+    href="{@docRoot}resources/samples/TicTacToeMain/index.html">TicTacToeMain</a>
+    sample application.
+ </dd>
+ <dt><a href="TicTacToeMain/index.html">TicTacToeMain</a></dt>
+ <dd>
+    An example of an Android application that makes use of code and
+    resources provided in an Android library project. Specifically, this
+    application uses code and resources provided in the <a
+    href="{@docRoot}resources/samples/TicTacToeLib/index.html">TicTacToeLib</a> library project.
+ </dd>
  <dt><a href="Wiktionary/index.html">Wiktionary</a></dt>
   <dd>An example of creating interactive widgets for display on the Android
   home screen.</dd>