tree 5f86e063378025b8ae08b4dde591807743ef7ce9
parent 0dc0dab71024e07431eb6d20b6165822da734902
parent 2dda21b93f8a8e0fb70de44eae826bc68349813c
author Dianne Hackborn <hackbod@google.com> 1293071828 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1293071828 -0800

am 2dda21b9: Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." into gingerbread

* commit '2dda21b93f8a8e0fb70de44eae826bc68349813c':
  Another stab at fixing issue #3149290 java.lang.RuntimeException:...