OSDN Git Service
(root)
/
android-x86
/
development.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
52cc9b9
1a13258
)
am 1a132581: Merge "Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey...
author
Yu Shan Emily Lau
<yslau@google.com>
Thu, 24 Jun 2010 22:42:29 +0000
(15:42 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 24 Jun 2010 22:42:29 +0000
(15:42 -0700)
Merge commit '
1a132581a5ce6188989d8522d227392c05cb42f6
' into froyo-plus-aosp
* commit '
1a132581a5ce6188989d8522d227392c05cb42f6
':
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.
Trivial merge