Merge branch 'release/3.4' into issue/1982-simperium-concurrency

Conflicts: WordPress/src/main/java/org/wordpress/android/models/Note.java
wordpress-mobile · Nov 19, 2014 · faae1d3 · faae1d3
2 parents 3a0c45e + 1e499a6
commit faae1d3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/WPImageGetter.java b/WordPressUtils/src/main/java/org/wordpress/android/util/WPImageGetter.java
@@ -112,7 +112,7 @@ public void onResponse(ImageLoader.ImageContainer response, boolean isImmediate)
         return remote;
     }
 
-    private static class RemoteDrawable extends BitmapDrawable {
+    public static class RemoteDrawable extends BitmapDrawable {
         Drawable mRemoteDrawable;
         final Drawable mLoadingDrawable;
         final Drawable mFailedDrawable;