diff options
| author | Luis Hector Chavez <lhchavez@google.com> | 2016-06-01 20:11:15 +0000 |
|---|---|---|
| committer | Luis Hector Chavez <lhchavez@google.com> | 2016-06-01 21:48:37 +0000 |
| commit | 83db8f75afbb37010450a6a5607764dedf20db6b (patch) | |
| tree | a125cec814362b362eefa3b70bec5eef746400b9 /src/streams.h | |
| parent | abfe7a063bbaebdca8703d27137c8c9aed826dac (diff) | |
| download | libweave-83db8f75afbb37010450a6a5607764dedf20db6b.tar.gz | |
Reland "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'"
This reverts commit abfe7a063bbaebdca8703d27137c8c9aed826dac.
All necessary changes are ready in AOSP for this to land.
Change-Id: I9ac99ebbb292e047e6d6a7978e5748987d7f0f9d
Reviewed-on: https://weave-review.googlesource.com/3720
Reviewed-by: Alex Vakulenko <avakulenko@google.com>
Diffstat (limited to 'src/streams.h')
| -rw-r--r-- | src/streams.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/streams.h b/src/streams.h index 990f47c..cefcf94 100644 --- a/src/streams.h +++ b/src/streams.h @@ -5,6 +5,8 @@ #ifndef LIBWEAVE_SRC_STREAMS_H_ #define LIBWEAVE_SRC_STREAMS_H_ +#include <vector> + #include <base/memory/weak_ptr.h> #include <weave/stream.h> |