diff options
author | Luis Hector Chavez <lhchavez@google.com> | 2016-05-31 23:41:41 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-05-31 23:41:41 +0000 |
commit | d77dfa0b5a854a80a586b89f13f602ee5a523d06 (patch) | |
tree | dd9041de1b74c6133fb3a07fcaa321de989b9668 /examples/provider/avahi_client.cc | |
parent | f91e999fb2dc8a70365471277e846e7b8e7b3284 (diff) | |
parent | abfe7a063bbaebdca8703d27137c8c9aed826dac (diff) | |
download | libweave-d77dfa0b5a854a80a586b89f13f602ee5a523d06.tar.gz |
Revert "Merge remote-tracking branch \'weave/master\' into \'weave/aosp-master\'"
am: abfe7a063b
* commit 'abfe7a063bbaebdca8703d27137c8c9aed826dac':
Revert "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'"
Change-Id: Id85d181a0a73598c6c4a3f397bd8085dd2c398e5
Diffstat (limited to 'examples/provider/avahi_client.cc')
-rw-r--r-- | examples/provider/avahi_client.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/examples/provider/avahi_client.cc b/examples/provider/avahi_client.cc index 36109c4..ddd4630 100644 --- a/examples/provider/avahi_client.cc +++ b/examples/provider/avahi_client.cc @@ -5,7 +5,6 @@ #include "examples/provider/avahi_client.h" #include <cstdlib> -#include <memory> #include <vector> #include <avahi-common/error.h> |