Upstream Android modifications to the image encoders/decoders.

src/images/SkBitmapRegionDecoder.cpp

Index: src/images/SkBitmapRegionDecoder.cpp
diff --git a/src/images/SkBitmapRegionDecoder.cpp b/src/images/SkBitmapRegionDecoder.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..4cf1cca45c983b305f63554945b9360262a7f09c
--- /dev/null
+++ b/src/images/SkBitmapRegionDecoder.cpp
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2011 The Android Open Source Project
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBitmapRegionDecoder.h"
+
+bool SkBitmapRegionDecoder::decodeRegion(SkBitmap* bitmap, const SkIRect& rect,
+                                         SkBitmap::Config pref, int sampleSize) {
+    fDecoder->setSampleSize(sampleSize);
+    return fDecoder->decodeRegion(bitmap, rect, pref);
+}