diff options
| author | Raphael <raphael@google.com> | 2010-11-23 02:44:59 -0800 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2010-11-23 02:44:59 -0800 |
| commit | 0aa3856227eb3b9f63419b6e91ac80f25f0dc104 (patch) | |
| tree | 61c0967e91759d2e6774ef2d72ee2f2c7380bcc1 /samples/TicTacToeMain | |
| parent | 6e20b04ed07925521b92c70eda6d8bdcb62ff3d9 (diff) | |
| parent | d7267fc295f43167488a52f249cbd58b5ac8507e (diff) | |
| download | android_development-0aa3856227eb3b9f63419b6e91ac80f25f0dc104.tar.gz android_development-0aa3856227eb3b9f63419b6e91ac80f25f0dc104.tar.bz2 android_development-0aa3856227eb3b9f63419b6e91ac80f25f0dc104.zip | |
resolved conflicts for merge of d7267fc2 to gingerbread-plus-aosp
Change-Id: Id3b056cf13bcfa50b3b4a00a22b8f482069c04c9
Diffstat (limited to 'samples/TicTacToeMain')
| -rwxr-xr-x | samples/TicTacToeMain/AndroidManifest.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/samples/TicTacToeMain/AndroidManifest.xml b/samples/TicTacToeMain/AndroidManifest.xml index 54654f962..077eaa776 100755 --- a/samples/TicTacToeMain/AndroidManifest.xml +++ b/samples/TicTacToeMain/AndroidManifest.xml @@ -19,6 +19,9 @@ package="com.example.android.tictactoe" android:versionCode="1" android:versionName="1.0"> + + <uses-sdk android:minSdkVersion="8" /> + <application android:icon="@drawable/icon" android:label="@string/app_name"> <activity android:name=".MainActivity" android:label="@string/app_name"> @@ -34,6 +37,4 @@ </application> - <uses-sdk android:minSdkVersion="8" /> - </manifest> |