diff options
author | Luis Hector Chavez <lhchavez@google.com> | 2016-06-01 22:14:23 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-01 22:14:23 +0000 |
commit | da4667b75ad79aa4530b3db12259be303a2cd9a1 (patch) | |
tree | 7f57ba7623a0cbf9621452f92e900095242090d5 /examples/provider/avahi_client.h | |
parent | 24b97cc306d4834f865f9599b379e73e1b326ab8 (diff) | |
parent | b20409af35ba1a15cd260567decb8ce9dca1d091 (diff) | |
download | libweave-da4667b75ad79aa4530b3db12259be303a2cd9a1.tar.gz |
Reland "Merge remote-tracking branch \'weave/master\' into \'weave/aosp-master\'" am: 83db8f75af
am: b20409af35
* commit 'b20409af35ba1a15cd260567decb8ce9dca1d091':
Reland "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'"
Change-Id: Iedc17137a9f07c6f9bbf2c6dc72b2cf211176c3f
Diffstat (limited to 'examples/provider/avahi_client.h')
-rw-r--r-- | examples/provider/avahi_client.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/provider/avahi_client.h b/examples/provider/avahi_client.h index 7d9b932..f9ba01c 100644 --- a/examples/provider/avahi_client.h +++ b/examples/provider/avahi_client.h @@ -6,6 +6,7 @@ #define LIBWEAVE_EXAMPLES_PROVIDER_AVAHI_CLIENT_H_ #include <map> +#include <memory> #include <string> #include <avahi-client/client.h> |