| commit | 31ed5fc6a4776b0522d26132de9018048157121d | [log] [tgz] |
|---|---|---|
| author | Amith Dsouza <amithds@google.com> | Sun Sep 20 01:36:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 20 01:36:00 2015 +0000 |
| tree | 48221ce2737261b73bb445df385c42dd21e5df0b | |
| parent | d781d8a61d3d28d93fbf91794cc821fc733d5118 [diff] | |
| parent | 1618c86df16352478a23a5868fb53beb561c3394 [diff] |
am 1618c86d: am 9c112acd: am 51139585: am 1dff0185: am 2d22fa9b: am 2e4ce593: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev * commit '1618c86df16352478a23a5868fb53beb561c3394':