tree ab517e0c8736f27bc5ab1e8854afa16c83504a65
parent 865df91ec2516f2eac50bd17d0d3e42c874a27f2
author Vitaly Buka <vitalybuka@google.com> 1446793569 -0800
committer Vitaly Buka <vitalybuka@google.com> 1446860394 +0000

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
(cherry picked from commit 4743a0864950575cd357b734ef1dd806c95ad238)

Change-Id: Ie157f5228901862e66fbf5108d18672233cb9e0d
Reviewed-on: https://weave-review.googlesource.com/1485
Reviewed-by: Vitaly Buka <vitalybuka@google.com>