tree ab517e0c8736f27bc5ab1e8854afa16c83504a65
parent 865df91ec2516f2eac50bd17d0d3e42c874a27f2
parent 65e1f21f13102b076156e2e6a07486c06f5b25d1
author Vitaly Buka <vitalybuka@google.com> 1446793569 -0800
committer Vitaly Buka <vitalybuka@google.com> 1446793569 -0800

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

* weave/master:
  Fix behavior of bootstrap manager after monitoring timeout was reached
  Added instruction for checking examples/daemon/README for details.
  Include cmath, needed for FP std::abs.
  examples/daemon: split daemon into seperate binaries