tree e19bc769afdd985d5134e6b84a12ef0418ae0e69
parent 01d04ed0ff6fdc7b5c54c256a292e1508023ba1b
parent 1dc2e594fb54dc5328819810d83d4e9a040bd2e2
author vichang <vichang@google.com> 1505999164 +0000
committer android-build-merger <android-build-merger@google.com> 1505999164 +0000

Merge "Remove setsockoptGroupSourceReq and StructGroupSourceReq" am: 0d73c15fb7 am: fae9e5c68f am: 480262f535
am: 1dc2e594fb

Change-Id: I080c9bd1ad75f9875ef92d31137ae582ee0b454c