tree 3f4ae29dd568b69be2cb8dc2fc97ea9044960543
parent 22c5e2693959d0e65935fdcfc670520f1d129186
parent 460913981a6a93939cbf1f98d6059e365c7170ff
author Conley Owens <cco3@android.com> 1304115105 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1304115105 -0700

am 7dcdfd79: am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here."

* commit '7dcdfd7988d1e57c7a705a2d7294e8bfa2b8afc9':
  Eliminating dead logic - bitmap state simply cannot be null here.