am 55f1b0b8: am 9d6824cd: Merge "Make Activity.removeDialog() less strict." into gingerbread

Merge commit '55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f'

* commit '55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f':
  Make Activity.removeDialog() less strict.