tree 254faac537583043c2096a88c2f194ad81847f7f
parent 6673173f156316105e18c52b03057cd621361a7e
parent d636777d624428dfc51d1181f47602f389eb4cce
author Elliott Hughes <enh@google.com> 1408124199 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1408079028 +0000

Merge "Avoid triggering StrictMode when closing a socket." into lmp-dev