tree af629100e200117b083c76035196c99b088bacb2
parent 0c05edf0c5d20fff5ab4ceb19c21a7d72088c2e2
parent c6eb5ac988518f41938c4f021003d6c202d84819
author Android (Google) Code Review <android-gerrit@google.com> 1248973052 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1248973052 -0700

am c6eb5ac9: Merge change 9071 into donut

Merge commit 'c6eb5ac988518f41938c4f021003d6c202d84819'

* commit 'c6eb5ac988518f41938c4f021003d6c202d84819':
  Fix issue #2018454: NullPointerException in ImageSpan constructor