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/NotePad | |
| 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/NotePad')
| -rw-r--r-- | samples/NotePad/AndroidManifest.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/samples/NotePad/AndroidManifest.xml b/samples/NotePad/AndroidManifest.xml index b87dfe312..83e5732b9 100644 --- a/samples/NotePad/AndroidManifest.xml +++ b/samples/NotePad/AndroidManifest.xml @@ -22,6 +22,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.android.notepad" > + <uses-sdk android:targetSdkVersion="4" android:minSdkVersion="3"/> + <application android:icon="@drawable/app_notes" android:label="@string/app_name" > <provider android:name="NotePadProvider" @@ -107,6 +109,4 @@ </application> - <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="4"/> </manifest> - |