am 17e36d23: am 3c44db3f: Merge "Missed a case to resumeUpdatePicture." into froyo

Merge commit '17e36d233dff7178e60d841a650d9bef5d0af93c' into kraken

* commit '17e36d233dff7178e60d841a650d9bef5d0af93c':
  Missed a case to resumeUpdatePicture.