tree 47f6db0ae3fe6061ce23e1e5f8002308e732e418
parent 9f8cc518e14c7a34bc52da712afbf02d84585f67
parent 08c7473ce9b601e170fd79c530f106bf74277a0f
author James Dong <jdong@google.com> 1276291735 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1276291735 -0700

Merge "Initial checkin for pause and resume control" into kraken