tree e66b0fb458a71a808fdb7bf880c6b1ed1882bcbe
parent 8c819445ebdbb6bea015acf463023ef486b091bc
parent 5e67ce2496fc5fc3655ac1c728e94626c3e8f6c9
author Alex Vakulenko <avakulenko@google.com> 1461261011 -0700
committer Alex Vakulenko <avakulenko@google.com> 1461261072 -0700

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

5e67ce2 libweave: Split "base" trait into "device" and "privet".
22ca81a libweave: Clean up code
3f59975 libweave: Fix build break on Brillo
e90f36f libweave: Update comment on handling new commands
bf7d663 README: update pre-requisites
8ee0c1e libweave: Reformat examples/provider/README
daeafc6 libweave: Remove unused local constant
25845ac add _ledflasher traits to the test_schema device.

Change-Id: I379a48da3fc955cd553a8954ffad8af47eb3200f