Bump version to 2.0.2 + document inclusion of OkHttp extension

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

README.md

@@ -20,8 +20,6 @@ and extend, and can be updated through Play Store application updates.
 
 
 ## Using ExoPlayer ##
 ## Using ExoPlayer ##
 
 
-#### Via jCenter ####
-
 The easiest way to get started using ExoPlayer is to add it as a gradle
 The easiest way to get started using ExoPlayer is to add it as a gradle
 dependency. You need to make sure you have the jcenter repository included in
 dependency. You need to make sure you have the jcenter repository included in
 the `build.gradle` file in the root of your project:
 the `build.gradle` file in the root of your project:
@@ -44,31 +42,6 @@ project's [Releases][]. For more details, see the project on [Bintray][].
 [Releases]: https://github.com/google/ExoPlayer/releases
 [Releases]: https://github.com/google/ExoPlayer/releases
 [Bintray]: https://bintray.com/google/exoplayer/exoplayer/view
 [Bintray]: https://bintray.com/google/exoplayer/exoplayer/view
 
 
-#### As source ####
-
-ExoPlayer can also be built from source using Gradle. You can include it as a
-dependent project like so:
-
-```gradle
-// settings.gradle
-include ':app', ':..:ExoPlayer:library'
-
-// app/build.gradle
-dependencies {
-    compile project(':..:ExoPlayer:library')
-}
-```
-
-#### As a jar ####
-
-If you want to use ExoPlayer as a jar, run:
-
-```sh
-./gradlew jarRelease
-```
-
-and copy `library.jar` to the libs folder of your new project.
-
 ## Developing ExoPlayer ##
 ## Developing ExoPlayer ##
 
 
 #### Project branches ####
 #### Project branches ####

RELEASENOTES.md

 # Release notes #
 # Release notes #
 
 
+### r2.0.2 ###
+
+* Fixes for MergingMediaSource and sideloaded subtitles.
+  ([#1882](https://github.com/google/ExoPlayer/issues/1882),
+  [#1854](https://github.com/google/ExoPlayer/issues/1854)).
+* Reduced effect of application code leaking player references
+  ([#1855](https://github.com/google/ExoPlayer/issues/1855)).
+* Initial support for fragmented MP4 in HLS.
+* Misc bug fixes and minor features.
+
 ### r2.0.1 ###
 ### r2.0.1 ###
 
 
 * Fix playback of short duration content
 * Fix playback of short duration content

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.1'
+        releaseVersion = 'r2.0.2'
         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="2001"
-    android:versionName="2.0.1">
+    android:versionCode="2002"
+    android:versionName="2.0.2">
 
 
   <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"/>

extensions/okhttp/README.md

@@ -2,8 +2,29 @@
 
 
 ## Description ##
 ## Description ##
 
 
-The OkHttp Extension is an [HttpDataSource][] implementation using Square's [OkHttp][].
+The OkHttp Extension is an [HttpDataSource][] implementation using Square's
+[OkHttp][].
+
+## Using the extension ##
+
+The easiest way to use the extension is to add it as a gradle dependency. You
+need to make sure you have the jcenter repository included in the `build.gradle`
+file in the root of your project:
+
+```gradle
+repositories {
+    jcenter()
+}
+```
+
+Next, include the following in your module's `build.gradle` file:
+
+```gradle
+compile 'com.google.android.exoplayer:extension-okhttp:rX.X.X'
+```
+
+where `rX.X.X` is the version, which must match the version of the ExoPlayer
+library being used.
 
 
 [HttpDataSource]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/upstream/HttpDataSource.html
 [HttpDataSource]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/upstream/HttpDataSource.html
 [OkHttp]: https://square.github.io/okhttp/
 [OkHttp]: https://square.github.io/okhttp/
-

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.1";
+  String VERSION = "2.0.2";
 
 
   /**
   /**
    * 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 = 2000001;
+  int VERSION_INT = 2000002;
 
 
   /**
   /**
    * 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/main/AndroidManifest.xml

@@ -17,8 +17,8 @@
 <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"
     package="com.google.android.exoplayer2.playbacktests"
-    android:versionCode="2001"
-    android:versionName="2.0.1">
+    android:versionCode="2002"
+    android:versionName="2.0.2">
 
 
   <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"/>