am 450b713e: am 437e9cc3: Merge "Adjust buffer position after copying" into jb-mr1-dev

* commit '450b713e83e2e45e43df06649e377c50e33922d4':
  Adjust buffer position after copying

graphics/java/android/graphics/Bitmap.java

@@ -413,6 +413,11 @@ public final class Bitmap implements Parcelable {
         }
 
         nativeCopyPixelsFromBuffer(mNativeBitmap, src);
+
+        // now update the buffer's position
+        int position = src.position();
+        position += bitmapBytes >> shift;
+        src.position(position);
     }
 
     /**