tree aa1bfc07a0100602f75d30bb7557e1bfa4d673b5
parent b930fb22b2427b4ef34d97d6487b319968e002fa
parent 4c244c1913dfe499a4c9416adce63ff75d25aa24
author Conley Owens <cco3@android.com> 1304114238 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1304114238 -0700

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

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