tree 21e558a5aa521dc9f3adbe764c9604526e652c81
parent c2ed03eadbe2141a2037e4d42fd455c26b5f3de4
parent 11316874bb56b5e00f1240baf1be7df0e6349db6
author Ankur Taly <ataly@google.com> 1416963980 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1416963980 +0000

Merge "veyron/runtimes/google/ipc: Add NoDischarges option to prevent discharge client infinite recursion of fetching discharges."