tree 4abbaa20027f3dc4b33453110a29a8be4fa5a31a
parent 889bb20f1bb47437331d404a59b86e6dfa4e2e93
parent f26ec38c344af8cf91575b461028a3033b940d49
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.