| commit | 14c0c1e4a08a398b83754274cd970caf7a7b35a2 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Sun Oct 10 12:49:17 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 10 12:49:17 2010 -0700 |
| tree | 18d0e50b627c087d95184a1d9aa7f5118989c668 | |
| parent | ed149c2dff63122927769291515978a89dfb34dd [diff] | |
| parent | cbe0d5b963122c3cd0d7d2b8404c3bffd0b823fd [diff] |
am cbe0d5b9: resolved conflicts for merge of de14fbd4 to gingerbread-plus-aosp Merge commit 'cbe0d5b963122c3cd0d7d2b8404c3bffd0b823fd' * commit 'cbe0d5b963122c3cd0d7d2b8404c3bffd0b823fd': Set monkey process name