From 5b9c92cb83f0b72ccae7f80ad17ccde9a72c212b Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Thu, 14 Aug 2014 15:45:33 +0100
Subject: [PATCH] Bump version to 1.0.12.

---
 demo/src/main/AndroidManifest.xml                             | 4 ++--
 .../com/google/android/exoplayer/ExoPlayerLibraryInfo.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
index 330adc6d2b..98ed2f18a9 100644
--- a/demo/src/main/AndroidManifest.xml
+++ b/demo/src/main/AndroidManifest.xml
@@ -16,8 +16,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer.demo"
-    android:versionCode="1010"
-    android:versionName="1.0.10"
+    android:versionCode="1012"
+    android:versionName="1.0.12"
     android:theme="@style/RootTheme">
 
   <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/library/src/main/java/com/google/android/exoplayer/ExoPlayerLibraryInfo.java b/library/src/main/java/com/google/android/exoplayer/ExoPlayerLibraryInfo.java
index 4661568d1e..06973db73b 100644
--- a/library/src/main/java/com/google/android/exoplayer/ExoPlayerLibraryInfo.java
+++ b/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.
    */
-  public static final String VERSION = "1.0.11";
+  public static final String VERSION = "1.0.12";
 
   /**
    * 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
    * corresponding integer version 1002003.
    */
-  public static final int VERSION_INT = 1000011;
+  public static final int VERSION_INT = 1000012;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer.util.Assertions}