tree 22598b1c5e1203e5937295bf81b0978b63cb4ff4
parent 4aa317d2209ec04cfe5e5401d53a8135b61befb0
parent e6fee32eeccd56bc0e07e513aa53e31042baff7b
author Alex Vakulenko <avakulenko@google.com> 1452549282 -0800
committer Alex Vakulenko <avakulenko@google.com> 1452549333 -0800

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

e6b17ed Update examples README file
e6fee32 Update command definition of sample daemon

Change-Id: I67367217208e5baa32295a5cb79a08cb64826b1f