tree b91b1046d65c193b61879e71183e9c1f4690777c
parent 0ca4252363395ab84f1af9aac42537535f6c9e85
parent 0e1e5223f96250e84323ae95d8cc9bd474b93502
author Adam Powell <adamp@google.com> 1314144830 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1314144830 -0700

am 0e1e5223: Merge "Fix bug 5149918 - Can\'t call ProgressDialog.setProgressNumberFormat() before dialog is shown"

* commit '0e1e5223f96250e84323ae95d8cc9bd474b93502':
  Fix bug 5149918 - Can't call ProgressDialog.setProgressNumberFormat() before dialog is shown