tree c05372325dfb2085a6ec4d400c22a7fc335f07e7
parent b55cf746536962d262c3b627e32a37464927b67b
parent a7d1a2dd776bf356c228785a94ba8e0ff6a2ec7f
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