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

maxme · maxme · commit faae1d38666f · 2014-11-19T09:48:36.000+01:00
Conflicts:
	WordPress/src/main/java/org/wordpress/android/models/Note.java
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;

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public void onResponse(ImageLoader.ImageContainer response, boolean isImmediate)`
`112`	`112`	`return remote;`
`113`	`113`	`}`
`114`	`114`
`115`		`- private static class RemoteDrawable extends BitmapDrawable {`
	`115`	`+ public static class RemoteDrawable extends BitmapDrawable {`
`116`	`116`	`Drawable mRemoteDrawable;`
`117`	`117`	`final Drawable mLoadingDrawable;`
`118`	`118`	`final Drawable mFailedDrawable;`