tree 4e94f6963012e4b8f6a6929fb5ac3236e61de329
parent 7329b749cdcdf17d0bdb0897d71d6795c3053dd8
parent 73c8cfceede41899c0847ea8cfa4595049576a8f
author Vitaly Buka <vitalybuka@google.com> 1453416854 -0800
committer Vitaly Buka <vitalybuka@google.com> 1453416854 -0800

Merge remote-tracking branch 'weave/master' into dev_dev2

* weave/master:
  provider/avahi_client: better error message
  Change proxied Makefile dependencies to .h.
  Pull the new r369476 of base library from Chromium
  Fix clock mock in ComponentManagerTest