OSDN Git Service

am 17e36d23: am 3c44db3f: Merge "Missed a case to resumeUpdatePicture." into froyo
authorGrace Kloba <klobag@google.com>
Fri, 16 Apr 2010 23:40:54 +0000 (16:40 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 16 Apr 2010 23:40:54 +0000 (16:40 -0700)
Merge commit '17e36d233dff7178e60d841a650d9bef5d0af93c' into kraken

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


Trivial merge