Merge pull request square#378 from square/dimitris/tiny

No iterator on joined requests, minor javadoc fix.

Author: JakeWharton

picasso/src/main/java/com/squareup/picasso/Picasso.java

@@ -300,7 +300,9 @@ void complete(BitmapHunter hunter) {
     Bitmap result = hunter.getResult();
     LoadedFrom from = hunter.getLoadedFrom();
 
-    for (Action join : joined) {
+    //noinspection ForLoopReplaceableByForEach
+    for (int i = 0, n = joined.size(); i < n; i++) {
+      Action join = joined.get(i);
       if (join.isCancelled()) {
         continue;
       }

picasso/src/main/java/com/squareup/picasso/RequestCreator.java

@@ -39,8 +39,8 @@ public class RequestCreator {
   private boolean noFade;
   private boolean deferred;
   private int placeholderResId;
-  private Drawable placeholderDrawable;
   private int errorResId;
+  private Drawable placeholderDrawable;
   private Drawable errorDrawable;
 
   RequestCreator(Picasso picasso, Uri uri, int resourceId) {
@@ -258,6 +258,10 @@ public void fetch() {
    *   {@literal @}Override public void onBitmapFailed() {
    *     setBackgroundResource(R.drawable.profile_error);
    *   }
+   *
+   *   {@literal @}Override public void onPrepareLoad(Drawable placeHolderDrawable) {
+   *     frame.setBackgroundDrawable(placeHolderDrawable);
+   *   }
    * }
    * </pre></blockquote>
    * Implementing on a view holder object for use inside of an adapter:
@@ -273,6 +277,10 @@ public void fetch() {
    *   {@literal @}Override public void onBitmapFailed() {
    *     frame.setBackgroundResource(R.drawable.profile_error);
    *   }
+   *
+   *   {@literal @}Override public void onPrepareLoad(Drawable placeHolderDrawable) {
+   *     frame.setBackgroundDrawable(placeHolderDrawable);
+   *   }
    * }
    * </pre></blockquote>
    * <p>