| commit | 97e88d58df6ea96202874fc470b7d971ba9e8c09 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Jun 03 23:56:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 03 23:56:30 2015 +0000 |
| tree | 77f0e3df378c8a752c5be5797a1e56a45267fe2a | |
| parent | dd9d85838e5b8e378ef722c0058926774a6719fc [diff] | |
| parent | 545799ef30155f078a03f196218f8ef5a3551ca1 [diff] |
am 545799ef: resolved conflicts for merge of 1a927f46 to lmp-mr1-modular-dev * commit '545799ef30155f078a03f196218f8ef5a3551ca1': LocalSocketTest.testAccessors: fix the *SendBufferSize* test