tree bf1b78ec39fc2a2c0440bd1f92b02516b2f0c571
parent 21993e0ea5a4c712bf176e360ea19dc2fda41e16
parent da0ec8222e89f4d72e57a63b919cbfbc7a6de2d5
author Mark D. Roth <roth@google.com> 1475523271 -0700
committer Mark D. Roth <roth@google.com> 1475523271 -0700

Merge branch 'fake_resolver' into service_config