tree fcd455d88c532282c943e64fe131b47e7eae1600
parent 65db994ad304ea34d3baf7552e9918f1de00b949
parent 7e653fb24680aaa300ab2372635cca43a1f5656e
author Grace Kloba <klobag@google.com> 1271461105 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1271461105 -0700

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

Merge commit '3c44db3f67c1f0bf82191ba77ca479c0e7fede34' into froyo-plus-aosp

* commit '3c44db3f67c1f0bf82191ba77ca479c0e7fede34':
  Missed a case to resumeUpdatePicture.