commit d9aef73f72cb11ba7f278a0ef13c6d02ffc95851
author Mitsuru Oshima <oshima@google.com> Tue Jun 16 20:20:50 2009 -0700
committer Mitsuru Oshima <oshima@google.com> Tue Jun 16 20:22:12 2009 -0700
tree 343f73ba5f36abec2c5457e85e47696ac713ed8b
parent 5f15d151b5101fadfe6cba1e8f4aa6367e8c603e

Squashed commit of the following:

commit 9798cd23605c96c1d6a29202f4d31f5454079b61
Author: Mitsuru Oshima <oshima@google.com>
Date:   Tue Jun 16 13:50:44 2009 -0700

    Made other toShortString in performDestroyActivity safe.

commit 19bf973df81d9d01210effb39c99e5236f2229c1
Author: Mitsuru Oshima <oshima@google.com>
Date:   Fri Jun 12 15:50:03 2009 -0700

    * component can be null after destory?
     This was causing NPE in catch block, which hides the actual exception.

Conflicts:

	core/java/android/app/ActivityThread.java