tree 9e0b1f5c456eeba637d3393813f12ba7ee80ab3a
parent 9a617138cc3212e49a527ef3afc15ad221c325f3
parent 82fbde6ca123c68b117b043f3b91514d95c93cc0
author Robert Sesek <rsesek@google.com> 1485369186 +0000
committer android-build-merger <android-build-merger@google.com> 1485369186 +0000

Merge "Ensure property_set connection sockets are CLOEXEC." am: 1ef5ecaca2 am: 5d6e678b9d am: 31992ebcaf
am: 82fbde6ca1

Change-Id: Ie6d81482f7f1cb38e694fb1428d22143327f99c8