tree 95ff354e3bfbf7c14e7c5231d450a3353d3f9bbb
parent b5a0cce85b99ee95ab7e10705d967072b4e31ae6
parent 14f6f0c59c14a21c6aa9f28e384efb14d3572277
author Elliott Hughes <enh@google.com> 1476400003 +0000
committer android-build-merger <android-build-merger@google.com> 1476400003 +0000

Merge "Retire socket_loopback_client." am: ecc7336e5c
am: 14f6f0c59c

Change-Id: Ib3c6af1d582cb7a8c37a4803abb1a048bbeaf51c