From a007d9a2e73a5cac811f82c8f57ac84aed527c03 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 20 Dec 2016 03:28:19 -0800
Subject: [PATCH] Bump version + update release notes

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=142539314
---
 RELEASENOTES.md                                  | 16 +++++++++++++---
 build.gradle                                     |  2 +-
 demo/src/main/AndroidManifest.xml                |  4 ++--
 .../android/exoplayer2/ExoPlayerLibraryInfo.java |  4 ++--
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index feaa240220..8ddbe4068c 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,9 +1,19 @@
 # Release notes #
 
-### r2.1.0 ###
+### r2.1.1 ###
 
-This release contains important bug fixes. Users of r2.0.x should proactively
-update to this version.
+Bugfix release only. Users of r2.1.0 and r2.0.x should proactively update to
+this version.
+
+* Fix some subtitle types (e.g. WebVTT) being displayed out of sync
+  ([#2208](https://github.com/google/ExoPlayer/issues/2208)).
+* Fix incorrect position reporting for on-demand HLS media that includes
+  EXT-X-PROGRAM-DATE-TIME tags
+  ([#2224](https://github.com/google/ExoPlayer/issues/2224)).
+* Fix issue where playbacks could get stuck in the initial buffering state if
+  over 1MB of data needs to be read to initialize the playback.
+
+### r2.1.0 ###
 
 * HLS: Support for seeking in live streams
   ([#87](https://github.com/google/ExoPlayer/issues/87)).
diff --git a/build.gradle b/build.gradle
index 0ea3ad66f3..358b8f1404 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,7 +35,7 @@ allprojects {
         releaseRepoName = 'exoplayer'
         releaseUserOrg = 'google'
         releaseGroupId = 'com.google.android.exoplayer'
-        releaseVersion = 'r2.1.0'
+        releaseVersion = 'r2.1.1'
         releaseWebsite = 'https://github.com/google/ExoPlayer'
     }
 }
diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
index d1b44abafe..4c6d832211 100644
--- a/demo/src/main/AndroidManifest.xml
+++ b/demo/src/main/AndroidManifest.xml
@@ -16,8 +16,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer2.demo"
-    android:versionCode="2100"
-    android:versionName="2.1.0">
+    android:versionCode="2101"
+    android:versionName="2.1.1">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
diff --git a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
index 45f63d713d..ea522ac4c8 100644
--- a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
+++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
@@ -23,7 +23,7 @@ public interface ExoPlayerLibraryInfo {
   /**
    * The version of the library, expressed as a string.
    */
-  String VERSION = "2.1.0";
+  String VERSION = "2.1.1";
 
   /**
    * The version of the library, expressed as an integer.
@@ -32,7 +32,7 @@ public interface ExoPlayerLibraryInfo {
    * corresponding integer version 1002003 (001-002-003), and "123.45.6" has the corresponding
    * integer version 123045006 (123-045-006).
    */
-  int VERSION_INT = 2001000;
+  int VERSION_INT = 2001001;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}