merge heads

This commit is contained in:
Jimmy Shih
2012-03-20 10:23:19 -07:00
parent 1893c3557d
commit 08a17a58ef
21 changed files with 640 additions and 377 deletions
+12 -6
View File
@@ -15,16 +15,22 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.android.apps.mytracks.lib"
android:versionCode="1"
android:versionName="1.0">
android:versionCode="1"
android:versionName="1.0"
package="com.google.android.apps.mytracks.lib" >
<!--
THIS IS A LIBRARY PROJECT.
See http://developer.android.com/guide/developing/eclipse-adt.html#libraryProject
for details on what should go here vs in the application project.
-->
<uses-sdk android:minSdkVersion="7" />
<application android:icon="@drawable/arrow_icon"
android:label="@string/lib_name">
<application
android:icon="@drawable/arrow_icon"
android:label="@string/lib_name" >
</application>
<uses-sdk
android:minSdkVersion="7"
android:targetSdkVersion="15" />
</manifest>