commit | ae2c47746b5fda636a157c4fdb0365a67d4604c3 | [log] [tgz] |
---|---|---|
author | James Dong <jdong@google.com> | Fri Jun 11 14:31:49 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 11 14:31:49 2010 -0700 |
tree | 16d94673d8594ea35239be1a68b3828f6e0615ad | |
parent | 4d4f265e6b6ccfc239150bd71aa2ce2b8de6237f [diff] | |
parent | f62c57d684b83df7d2817db976c0afdb500ae92a [diff] |
am f62c57d6: Merge "Initial checkin for pause and resume control" into kraken Merge commit 'f62c57d684b83df7d2817db976c0afdb500ae92a' into gingerbread-plus-aosp * commit 'f62c57d684b83df7d2817db976c0afdb500ae92a': Initial checkin for pause and resume control