From b34c46415dc4067fa50ff94f7ce104ff0d90c123 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 17 Aug 2018 05:06:54 -0700
Subject: [PATCH] Bump version to 2.8.4

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=209134753
---
 RELEASENOTES.md                                          | 9 ++++++---
 constants.gradle                                         | 4 ++--
 .../google/android/exoplayer2/ExoPlayerLibraryInfo.java  | 6 +++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index bdb4cff892..3c05471a89 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -107,13 +107,16 @@
   ([#4583](https://github.com/google/ExoPlayer/issues/4583)).
 * Add `DataSpec.httpMethod` and update `HttpDataSource` implementations to
   support HTTP HEAD method. Previously, only GET and POST were supported.
-* IMA: Improve handling of consecutive empty ad groups
-  ([#4030](https://github.com/google/ExoPlayer/issues/4030)),
-  ([#4280](https://github.com/google/ExoPlayer/issues/4280)).
 * Add option to show buffering view when playWhenReady is false
   ([#4304](https://github.com/google/ExoPlayer/issues/4304)).
 * Allow any `Drawable` to be used as `PlayerView` default artwork.
 
+### 2.8.4 ###
+
+* IMA: Improve handling of consecutive empty ad groups
+  ([#4030](https://github.com/google/ExoPlayer/issues/4030)),
+  ([#4280](https://github.com/google/ExoPlayer/issues/4280)).
+
 ### 2.8.3 ###
 
 * IMA:
diff --git a/constants.gradle b/constants.gradle
index 8016afbf8b..c1776b86c4 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -13,8 +13,8 @@
 // limitations under the License.
 project.ext {
     // ExoPlayer version and version code.
-    releaseVersion = '2.8.3'
-    releaseVersionCode = 2803
+    releaseVersion = '2.8.4'
+    releaseVersionCode = 2804
     // Important: ExoPlayer specifies a minSdkVersion of 14 because various
     // components provided by the library may be of use on older devices.
     // However, please note that the core media playback functionality provided
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 fef4b0f308..b8bf0e8813 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
@@ -29,11 +29,11 @@ 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.8.3";
+  public static final String VERSION = "2.8.4";
 
   /** 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.8.3";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.8.4";
 
   /**
    * The version of the library expressed as an integer, for example 1002003.
@@ -43,7 +43,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 = 2008003;
+  public static final int VERSION_INT = 2008004;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}