diff --git a/samples/AndroidBeamDemo/Android.mk b/samples/AndroidBeamDemo/Android.mk
new file mode 100644
index 000000000..a3063058f
--- /dev/null
+++ b/samples/AndroidBeamDemo/Android.mk
@@ -0,0 +1,15 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := samples
+
+# Only compile source java files in this apk.
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := AndroidBeamdemo
+
+LOCAL_SDK_VERSION := current
+
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+
+include $(BUILD_PACKAGE)
diff --git a/samples/AndroidBeamDemo/AndroidManifest.xml b/samples/AndroidBeamDemo/AndroidManifest.xml
index e01eb2d40..f4c06d936 100644
--- a/samples/AndroidBeamDemo/AndroidManifest.xml
+++ b/samples/AndroidBeamDemo/AndroidManifest.xml
@@ -24,7 +24,7 @@
     <uses-permission android:name="android.permission.NFC" />
     <uses-sdk android:minSdkVersion="14" />
     <uses-feature android:name="android.hardware.nfc" />
-    <application android:icon="@drawable/icon" android:label="@string/app_name">
+    <application android:icon="@drawable/ic_launcher" android:label="@string/app_name">
         <activity android:name="com.example.android.beam.Beam"
                 android:label="@string/app_name"
                 android:launchMode="singleTop">
diff --git a/samples/ApiDemos/_index.html b/samples/ApiDemos/_index.html
index e16a38a37..002ca1585 100644
--- a/samples/ApiDemos/_index.html
+++ b/samples/ApiDemos/_index.html
@@ -20,17 +20,17 @@ that illustrate the use of various Android APIs. It includes samples of:
 <p><strong>Update:</strong> The following are some of the new demos for Android 4.0:</p>
 <ul>
 <li><a
-href="src/com/example/android/apis/preference/PreferencesFromCode.java">SwitchPreference</a></li>
+href="src/com/example/android/apis/preference/PreferencesFromCode.html">SwitchPreference</a></li>
 <li><a
-href="src/com/example/android/apis/app/ActionBarActionProviderActivity.java">ShareActionProvider
+href="src/com/example/android/apis/app/ActionBarActionProviderActivity.html">ShareActionProvider
 </a></li>
-<li><a href="src/com/example/android/apis/view/SearchViewActionBar.java">Collapsible action
+<li><a href="src/com/example/android/apis/view/SearchViewActionBar.html">Collapsible action
 view</a></li>
-<li><a href="src/com/example/android/apis/app/FragmentCustomAnimations.java">Custom
+<li><a href="src/com/example/android/apis/app/FragmentCustomAnimations.html">Custom
 fragment animations</a></li>
-<li><a href="src/com/example/android/apis/app/RemoteService.java">Service bindings</a></li>
-<li><a href="src/com/example/android/apis/view/OverscanActivity.java">Full screen UI modes</a></li>
-<a><a href="src/com/example/android/apis/graphics/TouchPaint.java">Stylus and hover
+<li><a href="src/com/example/android/apis/app/RemoteService.html">Service bindings</a></li>
+<li><a href="src/com/example/android/apis/view/OverscanActivity.html">Full screen UI modes</a></li>
+<li><a href="src/com/example/android/apis/graphics/TouchPaint.html">Stylus and hover
 support</a></li>
 <li><a href="src/com/example/android/apis/view/Switches.html">Switch widget</a></li>
 </ul>