OSDN Git Service

resolved conflicts for merge of 42f87e1b to honeycomb-plus-aosp
authorThe Android Automerger <android-build@android.com>
Tue, 25 Jan 2011 07:45:43 +0000 (23:45 -0800)
committerThe Android Automerger <android-build@android.com>
Tue, 25 Jan 2011 07:45:43 +0000 (23:45 -0800)
commit902bc7bcea710d4698ce571ac3042a5338fc94e1
tree7a69d828f1842e70c85481e0ed0c576d4c2dd09b
parent8ae584edb2d0349ce42b775de795d9d35761f2da
parent42f87e1b4738635a024b7492cf18ede26d3c5d5d
resolved conflicts for merge of 42f87e1b to honeycomb-plus-aosp

Change-Id: Ic0ea8910670567e1725e42de76e6da0cd09decac
cmds/monkey/src/com/android/commands/monkey/Monkey.java