tree 715bdf3538d05fb0fef52aa5facceb9cb82666bc
parent 682d143decaa390f55428ac7b6c730831f54077d
parent 55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f
author Dianne Hackborn <hackbod@google.com> 1286585915 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286585915 -0700

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

Merge commit '55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f'

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