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

* commit '361317136150d83f09caeee4e95ba2140a1b9319':