Bump version + update release notes

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=142015031

RELEASENOTES.md

 # Release notes #
 # Release notes #
 
 
-### r2.0.4 ###
+### r2.1.0 ###
+
+This release contains important bug fixes. Users of r2.0.x should proactively
+update to this version.
+
+* HLS: Support for seeking in live streams
+  ([87](https://github.com/google/ExoPlayer/issues/87)).
+* HLS: Improved support:
+ * Support for EXT-X-PROGRAM-DATE-TIME
+   ([747](https://github.com/google/ExoPlayer/issues/747)).
+ * Improved handling of sample timestamps and their alignment across variants
+   and renditions.
+ * Fix issue that could cause playbacks to get stuck in an endless initial
+   buffering state.
+ * Correctly propagate BehindLiveWindowException instead of
+   IndexOutOfBoundsException exception
+   ([1695](https://github.com/google/ExoPlayer/issues/1695)).
+* MP3/MP4: Support for ID3 metadata, including embedded album art
+  ([979](https://github.com/google/ExoPlayer/issues/979)).
+* Improved customization of UI components. You can read about customization of
+  ExoPlayer's UI components
+  [here](https://medium.com/google-exoplayer/customizing-exoplayers-ui-components-728cf55ee07a#.9ewjg7avi).
+* Robustness improvements when handling MediaSource timeline changes and
+  MediaPeriod transitions.
+* EIA608: Support for caption styling and positioning.
+* MPEG-TS: Improved support:
+ * Support injection of custom TS payload readers.
+ * Support injection of custom section payload readers.
+ * Support SCTE-35 splice information messages.
+ * Support multiple table sections in a single PSI section.
+ * Fix NullPointerException when an unsupported stream type is encountered
+   ([2149](https://github.com/google/ExoPlayer/issues/2149)).
+ * Avoid failure when expected ID3 header not found
+   ([1966](https://github.com/google/ExoPlayer/issues/1966)).
+* Improvements to the upstream cache package.
+ * Support caching of media segments for DASH, HLS and SmoothStreaming. Note
+   that caching of manifest and playlist files is still not supported in the
+   (normal) case where the corresponding responses are compressed.
+ * Support caching for ExtractorMediaSource based playbacks.
+* Improved flexibility of SimpleExoPlayer
+  ([2102](https://github.com/google/ExoPlayer/issues/2102)).
+* Fix issue where only the audio of a video would play due to capability
+  detection issues ([2007](https://github.com/google/ExoPlayer/issues/2007))
+  ([2034](https://github.com/google/ExoPlayer/issues/2034))
+  ([2157](https://github.com/google/ExoPlayer/issues/2157)).
+* Fix issues that could cause ExtractorMediaSource based playbacks to get stuck
+  buffering ([1962](https://github.com/google/ExoPlayer/issues/1962)).
+* Correctly set SimpleExoPlayerView surface aspect ratio when an active player
+  is attached ([2077](https://github.com/google/ExoPlayer/issues/1976)).
+* OGG: Fix playback of short OGG files
+  ([1976](https://github.com/google/ExoPlayer/issues/1976)).
+* MP4: Support `.mp3` tracks
+  ([2066](https://github.com/google/ExoPlayer/issues/2066)).
+* SubRip: Don't fail playbacks if SubRip file contains negative timestamps
+  ([2145](https://github.com/google/ExoPlayer/issues/2145)).
+* Misc bugfixes.
 
 
-This release contains important bug fixes. Users of earlier r2.0.x versions
-should proactively update to this version.
+### r2.0.4 ###
 
 
 * Fix crash on Jellybean devices when using playback controls
 * Fix crash on Jellybean devices when using playback controls
   ([#1965](https://github.com/google/ExoPlayer/issues/1965)).
   ([#1965](https://github.com/google/ExoPlayer/issues/1965)).
@@ -113,6 +167,26 @@ some of the motivations behind ExoPlayer 2.x
  * Suppressed "Sending message to a Handler on a dead thread" warnings
  * Suppressed "Sending message to a Handler on a dead thread" warnings
    ([#426](https://github.com/google/ExoPlayer/issues/426)).
    ([#426](https://github.com/google/ExoPlayer/issues/426)).
 
 
+# Legacy release notes #
+
+Note: Since ExoPlayer V1 is still being maintained alongside V2, there is some
+overlap between these notes and the notes above. r2.0.0 followed from r1.5.11,
+and hence it can be assumed that all changes in r1.5.11 and earlier are included
+in all V2 releases. This cannot be assumed for changes in r1.5.12 and later,
+however it can be assumed that all such changes are included in the most recent
+V2 release.
+
+### r1.5.13 ###
+
+* Improvements to the upstream cache package.
+* MP4: Support `.mp3` tracks
+  ([2066](https://github.com/google/ExoPlayer/issues/2066)).
+* SubRip: Don't fail playbacks if SubRip file contains negative timestamps
+  ([2145](https://github.com/google/ExoPlayer/issues/2145)).
+* MPEG-TS: Avoid failure when expected ID3 header not found
+  ([1966](https://github.com/google/ExoPlayer/issues/1966)).
+* Misc bugfixes.
+
 ### r1.5.12 ###
 ### r1.5.12 ###
 
 
 * Improvements to Cronet network stack extension.
 * Improvements to Cronet network stack extension.

build.gradle

@@ -35,7 +35,7 @@ allprojects {
         releaseRepoName = 'exoplayer'
         releaseRepoName = 'exoplayer'
         releaseUserOrg = 'google'
         releaseUserOrg = 'google'
         releaseGroupId = 'com.google.android.exoplayer'
         releaseGroupId = 'com.google.android.exoplayer'
-        releaseVersion = 'r2.0.4'
+        releaseVersion = 'r2.1.0'
         releaseWebsite = 'https://github.com/google/ExoPlayer'
         releaseWebsite = 'https://github.com/google/ExoPlayer'
     }
     }
 }
 }

demo/src/main/AndroidManifest.xml

@@ -16,8 +16,8 @@
 
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer2.demo"
     package="com.google.android.exoplayer2.demo"
-    android:versionCode="2004"
-    android:versionName="2.0.4">
+    android:versionCode="2100"
+    android:versionName="2.1.0">
 
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

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.
    * The version of the library, expressed as a string.
    */
    */
-  String VERSION = "2.0.4";
+  String VERSION = "2.1.0";
 
 
   /**
   /**
    * The version of the library, expressed as an integer.
    * 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
    * corresponding integer version 1002003 (001-002-003), and "123.45.6" has the corresponding
    * integer version 123045006 (123-045-006).
    * integer version 123045006 (123-045-006).
    */
    */
-  int VERSION_INT = 2000004;
+  int VERSION_INT = 2001000;
 
 
   /**
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}
    * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}

playbacktests/src/androidTest/AndroidManifest.xml

@@ -16,9 +16,7 @@
 
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.android.exoplayer2.playbacktests"
-    android:versionCode="2004"
-    android:versionName="2.0.4">
+    package="com.google.android.exoplayer2.playbacktests">
 
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.WAKE_LOCK"/>
   <uses-permission android:name="android.permission.WAKE_LOCK"/>