OSDN Git Service

am ae2c4774: am f62c57d6: Merge "Initial checkin for pause and resume control" into...
authorJames Dong <jdong@google.com>
Fri, 11 Jun 2010 21:34:09 +0000 (14:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Jun 2010 21:34:09 +0000 (14:34 -0700)
commit6dd4cd53c147b3d0468e497763a8f52b67fd8335
tree148065c8ad7acd5ff445c1e7af5f5188f8c06a33
parent22b81d7c693031c20e906f82fd096aecea5607b0
parent9090e5fd608a06a2f086d7618cc18bc2b90d0ad7
am ae2c4774: am f62c57d6: Merge "Initial checkin for pause and resume control" into kraken

Merge commit 'ae2c47746b5fda636a157c4fdb0365a67d4604c3'

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