Commit 1f26fb17 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Gerrit Code Review
Browse files

Merge changes I41dcb9f8,I8bc80275 

* changes:
  Revert "Add a script for running art standalone."
  Add StandardSocketOptions to the black list.
parents ae7e954b 41dcb9f8
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment