| commit | 7de6b5a2e7043e6362056bbffe99c9ac445f8786 | [log] [tgz] |
|---|---|---|
| author | Amith Dsouza <amithds@google.com> | Sun Sep 20 02:13:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 20 02:13:30 2015 +0000 |
| tree | 9779095e5a603526d44704c559c820d3628c5ea8 | |
| parent | ed0ad511e26b2604639bd146db9cfeca890ada90 [diff] | |
| parent | 31ed5fc6a4776b0522d26132de9018048157121d [diff] |
am 129526fe: am e8bc988a: am 64865715: am 31ed5fc6: am 1618c86d: am 9c112acd: am 51139585: am 1dff0185: am 2d22fa9b: am 2e4ce593: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev * commit '129526fe24d18b0632694dd312fadded3491ac48':