Skip to content

Commit

Permalink
Merge branch 'release/3.4' into issue/1982-simperium-concurrency
Browse files Browse the repository at this point in the history
Conflicts:
	WordPress/src/main/java/org/wordpress/android/models/Note.java
  • Loading branch information
maxme committed Nov 19, 2014
2 parents 16e27f7 + 376d5d8 commit e6eb6dc
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit e6eb6dc

Please sign in to comment.