am 39637a37: Merge changes I3641b7c0,Ibdd1dbc8 into froyo

Merge commit '39637a37fb0074ad0d86c9f30aab5a0cae9ed26c' into froyo-plus-aosp

* commit '39637a37fb0074ad0d86c9f30aab5a0cae9ed26c':
  Project-lib sample: define lib activity.
  Switch from codename Froyo to API 8.

samples/TicTacToeLib/AndroidManifest.xml

@@ -16,7 +16,14 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.example.android.tictactoe.library"
+      package="com.example.android.tictactoe.library">
-      android:versionCode="1"
+    <application>
-      android:versionName="1.0">
+        <!-- The activity tag here is currently not used. The main project TicTacToeMain
-</manifest>
+             must currently redefine the activities to be used from the libraries.
+             However later the tools will pick up the activities from here and merge them
+             automatically, so it's best to define your activities here like for any
+             regular Android project.
+        -->
+        <activity android:name="GameActivity" />
+    </application>
+</manifest>

samples/TicTacToeMain/default.properties

@@ -25,5 +25,4 @@
 
 android.library.reference.1=../TicTacToeLib/
 # Project target. This requires the tools from SDK Froyo (API 8) to be used.
-# STOPSHIP change to target=8 once Froyo API is set to 8.
+target=8
-target=android-Froyo

samples/source.properties

@@ -1,5 +1,5 @@
 Pkg.UserSrc=false
 Pkg.Revision=1
-AndroidVersion.ApiLevel=7
+AndroidVersion.ApiLevel=8
-AndroidVersion.CodeName=Froyo
+#AndroidVersion.CodeName=