tree 95d325aef3845bbd180825d7ac5b89e6f8ab5923
parent 67dfafdc48b5ce7e13db0116eede95b2464e5182
parent 87e2f3e918d9a1a6e7fdaaf464f77909e17525d3
author Elliott Hughes <enh@google.com> 1476400482 +0000
committer android-build-merger <android-build-merger@google.com> 1476400482 +0000

Merge "Retire socket_loopback_client." am: ecc7336e5c am: 14f6f0c59c am: c056e49a99
am: 87e2f3e918

Change-Id: Iafc545ca74cd6b9175ea06e6723c6bcefc4c566f