merge heads

This commit is contained in:
Jimmy Shih
2012-02-13 10:02:29 -08:00
parent b10758cd96
commit 6979227410
5 changed files with 9 additions and 9 deletions
+2 -2
View File
@@ -17,8 +17,8 @@ limitations under the License.
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.android.maps.mytracks"
android:installLocation="auto"
android:versionCode="37"
android:versionName="1.1.14">
android:versionCode="38"
android:versionName="1.1.15">
<!-- Permissions to initialize service -->
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />