tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 79fa8d2fc03070a954eb24b78179e81e6f4d29b2
parent 361317136150d83f09caeee4e95ba2140a1b9319
author Sunny Goyal <sunnygoyal@google.com> 1422669711 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669711 +0000

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

* commit '361317136150d83f09caeee4e95ba2140a1b9319':