tree b0d6ca40bde4f2dbf8a69bd982bf053825434ab4
parent 624951463c7fa9e548ab51a0344bbd485cafc80f
parent 2e4ce593e3b6c611783bc660f95e2e783e004cd3
author Amith Dsouza <amithds@google.com> 1442336413 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442336413 +0000

am 2e4ce593: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev

* commit '2e4ce593e3b6c611783bc660f95e2e783e004cd3':
  LocalSocketTest.testAccessors: fix the *SendBufferSize* test