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

* commit '4aceb8738440204756e56fee92194769265dd83b':