diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
index 3a233ef204..ffe34972a6 100644
--- a/demo/src/main/AndroidManifest.xml
+++ b/demo/src/main/AndroidManifest.xml
@@ -25,7 +25,7 @@
   <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21"/>
+  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22"/>
 
   <application
       android:label="@string/application_name"
diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/DemoUtil.java b/demo/src/main/java/com/google/android/exoplayer/demo/DemoUtil.java
index fb60ca5252..558b294f09 100644
--- a/demo/src/main/java/com/google/android/exoplayer/demo/DemoUtil.java
+++ b/demo/src/main/java/com/google/android/exoplayer/demo/DemoUtil.java
@@ -25,7 +25,6 @@ import java.net.CookieHandler;
 import java.net.CookieManager;
 import java.net.CookiePolicy;
 import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Map;
 
@@ -52,7 +51,7 @@ public class DemoUtil {
   }
 
   public static byte[] executePost(String url, byte[] data, Map<String, String> requestProperties)
-      throws MalformedURLException, IOException {
+      throws IOException {
     HttpURLConnection urlConnection = null;
     try {
       urlConnection = (HttpURLConnection) new URL(url).openConnection();
diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/WidevineTestMediaDrmCallback.java b/demo/src/main/java/com/google/android/exoplayer/demo/WidevineTestMediaDrmCallback.java
index 378c74c202..1f29f6b7a1 100644
--- a/demo/src/main/java/com/google/android/exoplayer/demo/WidevineTestMediaDrmCallback.java
+++ b/demo/src/main/java/com/google/android/exoplayer/demo/WidevineTestMediaDrmCallback.java
@@ -22,8 +22,6 @@ import android.media.MediaDrm.KeyRequest;
 import android.media.MediaDrm.ProvisionRequest;
 import android.text.TextUtils;
 
-import org.apache.http.client.ClientProtocolException;
-
 import java.io.IOException;
 import java.util.UUID;
 
@@ -43,8 +41,7 @@ public class WidevineTestMediaDrmCallback implements MediaDrmCallback {
   }
 
   @Override
-  public byte[] executeProvisionRequest(UUID uuid, ProvisionRequest request)
-      throws ClientProtocolException, IOException {
+  public byte[] executeProvisionRequest(UUID uuid, ProvisionRequest request) throws IOException {
     String url = request.getDefaultUrl() + "&signedRequest=" + new String(request.getData());
     return DemoUtil.executePost(url, null, null);
   }
diff --git a/demo/src/main/project.properties b/demo/src/main/project.properties
index 77dfd37843..4fdc858b92 100644
--- a/demo/src/main/project.properties
+++ b/demo/src/main/project.properties
@@ -8,6 +8,6 @@
 # project structure.
 
 # Project target.
-target=android-21
+target=android-22
 android.library=false
 android.library.reference.1=../../../library/src/main
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index 39ee60e58d..6327960ac1 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -27,6 +27,6 @@
     the library may be of use on older devices. However, please note that the core video playback
     functionality provided by the library requires API level 16 or greater.
   -->
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="21"/>
+  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/>
 
 </manifest>
diff --git a/library/src/main/project.properties b/library/src/main/project.properties
index b756f4487f..95228a4fc6 100644
--- a/library/src/main/project.properties
+++ b/library/src/main/project.properties
@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-21
+target=android-22
 android.library=true
diff --git a/library/src/test/AndroidManifest.xml b/library/src/test/AndroidManifest.xml
index 517161f3b9..71bb5c3a66 100644
--- a/library/src/test/AndroidManifest.xml
+++ b/library/src/test/AndroidManifest.xml
@@ -17,7 +17,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer.tests">
 
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="21"/>
+  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/>
 
   <application>
     <uses-library android:name="android.test.runner"/>
diff --git a/library/src/test/project.properties b/library/src/test/project.properties
index 6e18427a42..00cf62bacc 100644
--- a/library/src/test/project.properties
+++ b/library/src/test/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-21
+target=android-22