merge heads

MyTracksLib/.classpath

@@ -3,7 +3,7 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry exported="true" kind="lib" path="libs/protobuf-java-2.3.0-lite.jar"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

MyTracksLib/AndroidManifest.xml

@@ -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">
+  package="com.google.android.apps.mytracks.lib"
+  android:versionCode="1"
+  android:versionName="1.0" >
+
   <!--
      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">
+  <uses-sdk
+    android:minSdkVersion="7"
+    android:targetSdkVersion="15" />
+
+  <application
+    android:icon="@drawable/arrow_icon"
+    android:label="@string/lib_name" >
   </application>
+
 </manifest>