# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1423945772 -3600
# Node ID a6e06f8d463c076087856db2a6217102be2da7d7
# Parent  40e965b10350084375b34e7afc83c3dbf9823b66
Merge manually from fa9cb0e70440, conclusively use Lolipop API level 21.

diff -r 40e965b10350 -r a6e06f8d463c AndroidManifest.xml
--- a/AndroidManifest.xml	Sat Feb 14 21:28:43 2015 +0100
+++ b/AndroidManifest.xml	Sat Feb 14 21:29:32 2015 +0100
@@ -6,7 +6,7 @@
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="21" />
 
     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
     <uses-permission android:name="android.permission.READ_CALENDAR" />
diff -r 40e965b10350 -r a6e06f8d463c project.properties
--- a/project.properties	Sat Feb 14 21:28:43 2015 +0100
+++ b/project.properties	Sat Feb 14 21:29:32 2015 +0100
@@ -11,4 +11,4 @@
 proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-21