diff options
| author | Raphael <raphael@google.com> | 2010-11-23 02:57:16 -0800 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2010-11-23 02:57:16 -0800 |
| commit | ba068ce3567ed190d1248eec3c6605c0975330c0 (patch) | |
| tree | 574089cd8a7a6a1851090c18bd69cc390f2f1a96 /samples/NotePad | |
| parent | 41430b9f30092cbd640105e0dd13f656685a750b (diff) | |
| parent | 0aa3856227eb3b9f63419b6e91ac80f25f0dc104 (diff) | |
| download | android_development-ba068ce3567ed190d1248eec3c6605c0975330c0.tar.gz android_development-ba068ce3567ed190d1248eec3c6605c0975330c0.tar.bz2 android_development-ba068ce3567ed190d1248eec3c6605c0975330c0.zip | |
resolved conflicts for merge of 0aa38562 to master
Change-Id: I2e79f7c906477bc5d02352de6a7be17fffb4730a
Diffstat (limited to 'samples/NotePad')
| -rw-r--r-- | samples/NotePad/AndroidManifest.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/samples/NotePad/AndroidManifest.xml b/samples/NotePad/AndroidManifest.xml index da92378a3..2e0d85a77 100644 --- a/samples/NotePad/AndroidManifest.xml +++ b/samples/NotePad/AndroidManifest.xml @@ -20,8 +20,10 @@ own application, the package name must be changed from "com.example.*" to come from a domain that you own or have control over. --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.example.android.notepad" -> + package="com.example.android.notepad" > + + <uses-sdk android:targetSdkVersion="4" android:minSdkVersion="3"/> + <application android:icon="@drawable/app_notes" android:label="@string/app_name" > @@ -115,6 +117,4 @@ </application> - <uses-sdk android:minSdkVersion="Froyo"/> </manifest> - |