Merge change 9124 into donut

* changes:
  Fix a bug in ImageView: The drawing matrix is not updated when setImageMatrix is called.

core/java/android/widget/ImageView.java

@@ -463,6 +463,7 @@ public class ImageView extends View {
         if (matrix == null && !mMatrix.isIdentity() ||
                 matrix != null && !mMatrix.equals(matrix)) {
             mMatrix.set(matrix);
+            configureBounds();
             invalidate();
         }
     }