am e962acef: am 6fdf6b22: Merge "Fixing Intrinsic dimensions of FastBitmapDrawable" into ub-now-porkchop

* commit 'e962acef86a4f1f634f268baa0102fc334db60c4':
  Fixing Intrinsic dimensions of FastBitmapDrawable
This commit is contained in:
Sunny Goyal authored and Android Git Automerger committed 2014-09-08 13:48:48 +00:00
commit d3b9aa2116
1 file changed
+2 -2
@@ -113,12 +113,12 @@ class FastBitmapDrawable extends Drawable {
@Override
public int getIntrinsicWidth() {
return getBounds().width();
return mBitmap.getWidth();
}
@Override
public int getIntrinsicHeight() {
return getBounds().height();
return mBitmap.getHeight();
}
@Override