diff options
author | Luis Hector Chavez <lhchavez@google.com> | 2016-05-31 23:30:06 +0000 |
---|---|---|
committer | Luis Hector Chavez <lhchavez@google.com> | 2016-05-31 23:34:09 +0000 |
commit | abfe7a063bbaebdca8703d27137c8c9aed826dac (patch) | |
tree | e66b0fb458a71a808fdb7bf880c6b1ed1882bcbe /examples/provider/avahi_client.h | |
parent | 43625e411feabd7df36a8768ba8c4eca58a22e4d (diff) | |
download | libweave-abfe7a063bbaebdca8703d27137c8c9aed826dac.tar.gz |
Revert "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'"
This reverts commit 43625e411feabd7df36a8768ba8c4eca58a22e4d.
This needs to happen in a staged fashion to avoid build breakages :/
Change-Id: Ie5474629bd301d7af27ee6167988b0381ac73271
Reviewed-on: https://weave-review.googlesource.com/3700
Reviewed-by: Luis Hector Chavez <lhchavez@google.com>
Diffstat (limited to 'examples/provider/avahi_client.h')
-rw-r--r-- | examples/provider/avahi_client.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/examples/provider/avahi_client.h b/examples/provider/avahi_client.h index f9ba01c..7d9b932 100644 --- a/examples/provider/avahi_client.h +++ b/examples/provider/avahi_client.h @@ -6,7 +6,6 @@ #define LIBWEAVE_EXAMPLES_PROVIDER_AVAHI_CLIENT_H_ #include <map> -#include <memory> #include <string> #include <avahi-client/client.h> |