tree cf849748715ba2565581fe564660bb59ede70144
parent 40dffe73d7414753e592e186df8515911da913c3
parent 1cb7758226b1bd3c8f39d9adb9068b02a18fcc7c
author Kenny Root <kroot@google.com> 1454498493 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1454498493 +0000

Merge "Add hack to make sure Socket#impl field is not null"