| commit | dc388c565be0f539ded2bca165fef347dc7a89cc | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Mon Dec 14 16:23:32 2009 -0800 |
| committer | Ying Wang <wangying@google.com> | Mon Dec 14 16:23:32 2009 -0800 |
| tree | a9799e5db72a0032756d1eb12bf86d999513c5dc | |
| parent | a35897da6fcddec45270324a67614deaaacbde94 [diff] | |
| parent | 5595acbed8ca1778a61881a00d7baaffecb2a64c [diff] |
Merge commit 'goog/eclair-mr2' into play-with-monkey Conflicts: cmds/monkey/src/com/android/commands/monkey/Monkey.java