merge heads

MyTracksLib/AndroidManifest.xml

@@ -15,22 +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: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"
+    android:targetSdkVersion="15" />
+
   <application
     android:icon="@drawable/arrow_icon"
     android:label="@string/lib_name" >
   </application>
 
-  <uses-sdk
-    android:minSdkVersion="7"
-    android:targetSdkVersion="15" />
-
 </manifest>