tree e06705b683a3eb5320573990ca8404c55b53a99c
parent bc9d27d41f5be6351069ac82b0cc0bb557c3829f
parent c93071caec674a080e569d8a9688f3f638ce8db6
author Alex Vakulenko <avakulenko@google.com> 1460052279 -0700
committer Alex Vakulenko <avakulenko@google.com> 1460052321 -0700

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

c93071c libweave: Always fetch commands from server, even if XMPP delivers JSON
c507804 libweave: Remove backup polling (30 minute poll interval)
eae016c clean up example/test_device clashes
fcffce3 disable builtin rules
fcf6b3e add standard "check" target
825c55c readme: document cross-compiling for end users
c0c256c Add "make coverage" target to build code coverage.
e2d68d4 Add general-use-and-purpose comment for Device interface.
39b96b6 create generic test device for multiple traits testing.
2fd3e55 libuweave: Fix break on Android toolchain

Change-Id: I99d58082cd31aa997a52e0beab55a8b795581f00