tree 74f0810ba2a4763edcc8e09dfb72fbc0cc88dc52
parent 5e7763dc86a881eda070a07866f4022e706df513
parent 0dbbf605efb8f72b3c2c15c14e613323fc2ac0a2
author Vitaly Buka <vitalybuka@google.com> 1453511555 -0800
committer Vitaly Buka <vitalybuka@google.com> 1453516142 -0800

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

0dbbf60 AddTo will return AddToTypeProxy for convenience
48a8669 Remove domain from weave::Error
50a147a Enforce printf format literals checking
73c8cfc provider/avahi_client: better error message
2da7e94 Change proxied Makefile dependencies to .h.

Change-Id: I3ee331e7cbca912ac8e9b00dba0a1a119ed50782