| commit | 79108f28d7d3b446867ad5e218554ac5b0486287 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Mon Oct 27 04:18:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 27 04:18:22 2014 +0000 |
| tree | f48ddf02eb142dcf63498141f4c0333ede3f0f49 | |
| parent | ae22c20a5b1df8e786240b009261b0c86d94a608 [diff] | |
| parent | f625a249b9a0de54eedf3fa0aaa549c1fb568298 [diff] |
am f625a249: am a91968fd: Merge "Accept socket connection before tracing." into lmp-dev * commit 'f625a249b9a0de54eedf3fa0aaa549c1fb568298':