am 3e584428: Merge change 9124 into donut
am 3e584428: Merge change 9124 into donut

Merge commit '3e584428deb098484cc881192dd221c81f707764'

* commit '3e584428deb098484cc881192dd221c81f707764':
  Fix a bug in ImageView: The drawing matrix is not updated when setImageMatrix is called.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base