OSDN Git Service

am f62c57d6: Merge "Initial checkin for pause and resume control" into kraken
authorJames Dong <jdong@google.com>
Fri, 11 Jun 2010 21:31:49 +0000 (14:31 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Jun 2010 21:31:49 +0000 (14:31 -0700)
Merge commit 'f62c57d684b83df7d2817db976c0afdb500ae92a' into gingerbread-plus-aosp

* commit 'f62c57d684b83df7d2817db976c0afdb500ae92a':
  Initial checkin for pause and resume control


Trivial merge