tree 67d035971d234d3ecbdf491174a46e0368974cc8
parent b6b117624b460fec104be94977ed64d190473182
author The Android Automerger <android-build@android.com> 1320293318 -0700
committer The Android Automerger <android-build@android.com> 1320293318 -0700

Revert "Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0"

This reverts commit 7f00c22b7fa7b38b644585c0a3c6faadc5def94c, reversing
changes made to 451fa13e82ea1226895b41282fdb33bf9fea5d19.