OSDN Git Service

am ea7d6e8e: Merge "Add the new option for the device sleep time. This is only for...
authorYu Shan Emily Lau <yslau@google.com>
Thu, 26 Aug 2010 22:27:57 +0000 (15:27 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 26 Aug 2010 22:27:57 +0000 (15:27 -0700)
commitf1598c4cf40fb8c00c93acd27ab3230a9c9620e6
tree06cdb68a6e76fb93cbc502a63b8cb8a753e48ed5
parent1cb87dac3363386295e1483053563aff2e1ac989
parentea7d6e8e6568b777693c52183e9abf973786a6b5
am ea7d6e8e: Merge "Add the new option for the device sleep time. This is only for the scripted monkey." into gingerbread

Merge commit 'ea7d6e8e6568b777693c52183e9abf973786a6b5' into gingerbread-plus-aosp

* commit 'ea7d6e8e6568b777693c52183e9abf973786a6b5':
  Add the new option for the device sleep time. This is only for the scripted monkey.
cmds/monkey/src/com/android/commands/monkey/Monkey.java