| commit | caef9d484f9f2a288c741add006dd8725083f92b | [log] [tgz] |
|---|---|---|
| author | Yu Shan Emily Lau <yslau@google.com> | Thu Jun 24 17:16:34 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 24 17:16:34 2010 -0700 |
| tree | f1e196270634356bdfbb7cb1ef007eb023e83d1d | |
| parent | 55f4a60aa0dc1c2fc5ef58df185c9426c262e0ba [diff] | |
| parent | 7c8c5d911c670df2c58bf1ece73e6bc576360696 [diff] |
am 7c8c5d91: am 3bacdf93: am 1a132581: Merge "Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out." into froyo Merge commit '7c8c5d911c670df2c58bf1ece73e6bc576360696' * commit '7c8c5d911c670df2c58bf1ece73e6bc576360696': Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out.