tree b1ea3f635a52dfe384df665645ec59e89daf2e91
parent 60a9d6e0e5ce35f3b17ac6c0f9930b6de6427c2e
parent aee14432800280cf4a44610420f9fe06f11f5aa1
author Nick Kralevich <nnk@google.com> 1395434034 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1395434034 +0000

Merge "Rewrite mediaserver socket rule using macro."