tree 2264c8ee4d0ef044ce8ea024810bcf0bfc0ce5a9
parent ad92ae7dd24f73b89ca80261b8f465c403ca5748
parent 122d0e411fc2cad77777a9087ccc2848bfe66e9c
author Yuli Huang <yuli@google.com> 1321391215 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321391215 -0800

am c5d42ff7: Merge "Fix b/5517002 by dismissing running progress dialog in onPause()." into ics-mr1

* commit 'c5d42ff75d53d8e1321da7c901d7b0e5e2bbaa1b':
  Fix b/5517002 by dismissing running progress dialog in onPause().