From b8c6ed670138ee4f864dc9cd7ba9cb5ff8a43094 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 8 Aug 2017 08:30:17 -0700
Subject: [PATCH] Bump to 2.5.1

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164595874
---
 RELEASENOTES.md                                            | 7 +++++++
 constants.gradle                                           | 2 +-
 demos/main/src/main/AndroidManifest.xml                    | 4 ++--
 .../google/android/exoplayer2/ExoPlayerLibraryInfo.java    | 6 +++---
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 4101caad47..8ad866395e 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,5 +1,12 @@
 # Release notes #
 
+### r2.5.1 ###
+
+* Fix an issue that could cause the reported playback position to stop advancing
+  in some cases.
+* Fix an issue where a Surface could be released whilst still in use by the
+  player.
+
 ### r2.5.0 ###
 
 * IMA extension: Wraps the Google Interactive Media Ads (IMA) SDK to provide an
diff --git a/constants.gradle b/constants.gradle
index 7d126ccd89..b7cc8b6906 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -24,7 +24,7 @@ project.ext {
     supportLibraryVersion = '25.4.0'
     dexmakerVersion = '1.2'
     mockitoVersion = '1.9.5'
-    releaseVersion = 'r2.5.0'
+    releaseVersion = 'r2.5.1'
     modulePrefix = ':'
     if (gradle.ext.has('exoplayerModulePrefix')) {
         modulePrefix += gradle.ext.exoplayerModulePrefix
diff --git a/demos/main/src/main/AndroidManifest.xml b/demos/main/src/main/AndroidManifest.xml
index 0e04d9a435..1f66822dc7 100644
--- a/demos/main/src/main/AndroidManifest.xml
+++ b/demos/main/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="2500"
-    android:versionName="2.5.0">
+    android:versionCode="2501"
+    android:versionName="2.5.1">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
index fd5ead5c85..33f992964a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
@@ -31,13 +31,13 @@ public final class ExoPlayerLibraryInfo {
    * The version of the library expressed as a string, for example "1.2.3".
    */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION_INT) or vice versa.
-  public static final String VERSION = "2.5.0";
+  public static final String VERSION = "2.5.1";
 
   /**
    * The version of the library expressed as {@code "ExoPlayerLib/" + VERSION}.
    */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final String VERSION_SLASHY = "ExoPlayerLib/2.5.0";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.5.1";
 
   /**
    * The version of the library expressed as an integer, for example 1002003.
@@ -47,7 +47,7 @@ public final class ExoPlayerLibraryInfo {
    * integer version 123045006 (123-045-006).
    */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final int VERSION_INT = 2005000;
+  public static final int VERSION_INT = 2005001;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}