tree fca6b1961821ec2fbf426d07b21d327e2cc73346
parent ae2207a89473c3b614d345257e6524aff2a4e1e7
parent 4168dc497ded7c697d972283db7c8579788c23d5
author Winson Chung <winsonc@google.com> 1392411239 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411239 +0000

am 4168dc49: am 97436804: am 540efef7: Merge changes Ida9603e3,I3dfa45cc into jb-ub-now-jolly-elf

* commit '4168dc497ded7c697d972283db7c8579788c23d5':
  Initialize FastBitmapDrawable bounds with default bitmap dimensions.
  Updating LauncherModel filtering to use screen ids. (Bug 11685286)