| commit | c173ac88344054a95480f6be94d6ddaaed0762a5 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Aug 15 17:42:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 15 17:42:40 2014 +0000 |
| tree | 254faac537583043c2096a88c2f194ad81847f7f | |
| parent | cc3f9d1e01fd9ec5c31ca30bfedd0a1624abb132 [diff] | |
| parent | 4781e999a945a5c44778b60166cde5a8b65c1c02 [diff] |
am 4781e999: Merge "Avoid triggering StrictMode when closing a socket." into lmp-dev * commit '4781e999a945a5c44778b60166cde5a8b65c1c02': Avoid triggering StrictMode when closing a socket.