Fixing the merge

This commit is contained in:
Joe Bowser 2009-10-28 13:49:37 -07:00
parent 4bb3237732
commit 5becaa3ca4

View File

@ -30,4 +30,4 @@
</application>
<uses-sdk android:minSdkVersion="4" />
</manifest>
</manifest>