Sat, 14 Feb 2015 21:29:32 +0100
Merge manually from fa9cb0e70440, conclusively use Lolipop API level 21.
AndroidManifest.xml | file | annotate | diff | comparison | revisions | |
project.properties | file | annotate | diff | comparison | revisions |
1.1 --- a/AndroidManifest.xml Sat Feb 14 21:28:43 2015 +0100 1.2 +++ b/AndroidManifest.xml Sat Feb 14 21:29:32 2015 +0100 1.3 @@ -6,7 +6,7 @@ 1.4 1.5 <uses-sdk 1.6 android:minSdkVersion="14" 1.7 - android:targetSdkVersion="19" /> 1.8 + android:targetSdkVersion="21" /> 1.9 1.10 <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" /> 1.11 <uses-permission android:name="android.permission.READ_CALENDAR" />
2.1 --- a/project.properties Sat Feb 14 21:28:43 2015 +0100 2.2 +++ b/project.properties Sat Feb 14 21:29:32 2015 +0100 2.3 @@ -11,4 +11,4 @@ 2.4 proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt 2.5 2.6 # Project target. 2.7 -target=android-19 2.8 +target=android-21