| commit | 626e98f92bba4fe3c3515c57c4c5c3fa749a1b62 | [log] [tgz] |
|---|---|---|
| author | Jianhong Jiang <jianhong@google.com> | Fri Nov 20 15:34:26 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 20 15:34:26 2009 -0800 |
| tree | 3dd799f0b097b4b7814f5a1d9b59eb178d20334c | |
| parent | 422872e9a1040199e00035ef9674844113ae0641 [diff] | |
| parent | a9e855cd0ce9104c087b748c68c67c2621ae2072 [diff] |
am a9e855cd: (-s ours) RIO-8067: set player engine watchdog timer lower bound to 1 sec. DO NOT MERGE. Merge commit 'a9e855cd0ce9104c087b748c68c67c2621ae2072' into eclair-mr2 * commit 'a9e855cd0ce9104c087b748c68c67c2621ae2072': RIO-8067: set player engine watchdog timer lower bound to 1 sec. DO NOT MERGE.