OSDN Git Service

resolved conflicts for merge of de14fbd4 to gingerbread-plus-aosp
authorYing Wang <wangying@google.com>
Thu, 7 Oct 2010 21:59:03 +0000 (14:59 -0700)
committerYing Wang <wangying@google.com>
Thu, 7 Oct 2010 21:59:03 +0000 (14:59 -0700)
Change-Id: I53302710ca0698daa5fe8ca3ce631a70d1578463

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