tree 19aabb3f1a49b5b96b18c4b1ffd531bfbf2ceffa
parent 05da7216240dbd3577a4172224133b7d24d1d61e
parent 98fd36fe241aec1418edf9a579d3b83b851ffc54
author Dianne Hackborn <hackbod@google.com> 1286460994 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286460994 -0700

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

Merge commit '9d6824cd53960b4562ea3c55876b40ca21710050' into gingerbread-plus-aosp

* commit '9d6824cd53960b4562ea3c55876b40ca21710050':
  Make Activity.removeDialog() less strict.