OSDN Git Service

Merge commit 'goog/eclair-mr2' into play-with-monkey
authorYing Wang <wangying@google.com>
Tue, 15 Dec 2009 00:23:32 +0000 (16:23 -0800)
committerYing Wang <wangying@google.com>
Tue, 15 Dec 2009 00:23:32 +0000 (16:23 -0800)
commitdc388c565be0f539ded2bca165fef347dc7a89cc
treea9799e5db72a0032756d1eb12bf86d999513c5dc
parenta35897da6fcddec45270324a67614deaaacbde94
parent5595acbed8ca1778a61881a00d7baaffecb2a64c
Merge commit 'goog/eclair-mr2' into play-with-monkey

Conflicts:

cmds/monkey/src/com/android/commands/monkey/Monkey.java
cmds/monkey/src/com/android/commands/monkey/Monkey.java