tree a125cec814362b362eefa3b70bec5eef746400b9
parent 51805a169e3ac961a84d6de222b0797cfff0f919
parent 637be7990843742d7ac6910ea909dcb09e9df175
author Luis Hector Chavez <lhchavez@google.com> 1464382458 -0700
committer Luis Hector Chavez <lhchavez@google.com> 1464382633 -0700

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

eed24467 Add volume trait to the test_schema device.
369d2f07 correcting volume property maximum value in if condition checking of volume trait of test_schema device.
d1f98a07 examples: remove samples with private traits
637be79 libweave: Update libchrome APIs to r395517

Change-Id: I69b312a616e67970f5cce82e7bd53a6dd266f36c