Merge pull request #448 from google/dev

Bump to 1.3.1

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.exoplayer.demo"
     package="com.google.android.exoplayer.demo"
-    android:versionCode="1300"
-    android:versionName="1.3.00"
+    android:versionCode="1301"
+    android:versionName="1.3.1"
     android:theme="@style/RootTheme">
     android:theme="@style/RootTheme">
 
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.INTERNET"/>

library/build.gradle

@@ -74,7 +74,7 @@ publish {
     userOrg = 'google'
     userOrg = 'google'
     groupId = 'com.google.android.exoplayer'
     groupId = 'com.google.android.exoplayer'
     artifactId = 'exoplayer'
     artifactId = 'exoplayer'
-    version = 'r1.2.3'
+    version = 'r1.3.1'
     description = 'The ExoPlayer library.'
     description = 'The ExoPlayer library.'
     website = 'https://github.com/google/ExoPlayer'
     website = 'https://github.com/google/ExoPlayer'
 }
 }

library/src/main/java/com/google/android/exoplayer/ExoPlayerLibraryInfo.java

@@ -26,7 +26,7 @@ public class ExoPlayerLibraryInfo {
   /**
   /**
    * The version of the library, expressed as a string.
    * The version of the library, expressed as a string.
    */
    */
-  public static final String VERSION = "1.3.0";
+  public static final String VERSION = "1.3.1";
 
 
   /**
   /**
    * The version of the library, expressed as an integer.
    * The version of the library, expressed as an integer.
@@ -34,7 +34,7 @@ public class ExoPlayerLibraryInfo {
    * Three digits are used for each component of {@link #VERSION}. For example "1.2.3" has the
    * Three digits are used for each component of {@link #VERSION}. For example "1.2.3" has the
    * corresponding integer version 001002003.
    * corresponding integer version 001002003.
    */
    */
-  public static final int VERSION_INT = 001003000;
+  public static final int VERSION_INT = 001003001;
 
 
   /**
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer.util.Assertions}
    * Whether the library was compiled with {@link com.google.android.exoplayer.util.Assertions}