diff options
| author | Alex Vakulenko <avakulenko@google.com> | 2016-04-21 18:06:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-21 18:06:03 +0000 |
| commit | bfee0fa1d24956b19909724ce7c30a9028ebe9ac (patch) | |
| tree | dd9041de1b74c6133fb3a07fcaa321de989b9668 /third_party/chromium/base/memory/scoped_ptr.h | |
| parent | a574810a80d4366e6afd0bd46716dab74d858f6c (diff) | |
| parent | e6ed8e260bf583568872a620450bef0cb76ae4e3 (diff) | |
| download | libweave-bfee0fa1d24956b19909724ce7c30a9028ebe9ac.tar.gz | |
Merge "Merge remote-tracking branch \'weave/master\' into \'weave/aosp-master\'" into aosp-master am: 51805a169e
am: e6ed8e260b
* commit 'e6ed8e260bf583568872a620450bef0cb76ae4e3':
libweave: Split "base" trait into "device" and "privet".
libweave: Clean up code
libweave: Fix build break on Brillo
libweave: Update comment on handling new commands
README: update pre-requisites
libweave: Reformat examples/provider/README
libweave: Remove unused local constant
add _ledflasher traits to the test_schema device.
Change-Id: Ic66772a1cf0dc35f22065a15f91dc89d83ba69be
Diffstat (limited to 'third_party/chromium/base/memory/scoped_ptr.h')
0 files changed, 0 insertions, 0 deletions