tree f472aab784e0632b82523d5b08f9dedc310ee6cb
parent b66eea339e8e58732e9b8fbdc11268d619cc9e57
parent 684bffe8649411d8864ec4ca480544c1c795c9ff
author Shyam Jayaraman <bjornick@google.com> 1407360327 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1407345577 +0000

Merge "veyron/services/wsprd: Use the origin from the websocket to link the identity to the pipe."