| commit | 879d21ebc314f242c15ca590b259abc914481cda | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Apr 05 14:36:51 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 05 14:36:51 2013 -0700 |
| tree | 9e6099c0db1b82039153f3e7feb0b5ccc8854a95 | |
| parent | 09e534931aa6dcba7da603bddc231011bf2dbcb8 [diff] | |
| parent | 8a4ae0a873862ea0a4764cd3492467843485f1e5 [diff] |
am 8a4ae0a8: resolved conflicts for merge of f79c0518 to jb-mr2-dev-plus-aosp * commit '8a4ae0a873862ea0a4764cd3492467843485f1e5': Modify debuggerd to cope with the abort message.