| commit | 8411eed10dfa75d10995035e77439263b4daeddc | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Sat Jun 06 00:05:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 06 00:05:48 2015 +0000 |
| tree | 0d33a8705a4421f0dae25db988650ead5705b2f7 | |
| parent | d2e884590de8910c37c1032e45db5e302a13d154 [diff] | |
| parent | 5aa28eadc33aea63639796aec339d84999d4fe9f [diff] |
am 8b93ce0f: (-s ours) DO NOT MERGE - resolved conflicts for merge of 97e88d58 to lmp-mr1-ub-dev * commit '8b93ce0f73af7dd41abc1e7ac85cf0dda4eaeeb9': LocalSocketTest.testAccessors: fix the *SendBufferSize* test