DO NOT MERGE: adb: use asocket\\\\\'s close function when closing. am:...
DO NOT MERGE: adb: use asocket\\\\\'s close function when closing. am: 5218ad36 am: d7e24ec9 am: a3d96cfe -s ours am: 45a4bca0 -s ours
am: fb9747c4
Change-Id: Ife4804a27b044aebaaefda6626adb61c241812af