tree fca6b1961821ec2fbf426d07b21d327e2cc73346
parent 1eea5cce05cd8fab42713ca1efb644938eb7bccc
parent 96df62ef12af2b0bddbe7b18c6b40e187d2ad539
author Winson Chung <winsonc@google.com> 1392411713 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411713 +0000

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

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