diff options
| author | Igor Murashkin <iam@google.com> | 2019-02-20 16:47:39 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-20 16:47:39 -0800 |
| commit | 6cce4d0f33aef9dab02d697d26219eccc57100d0 (patch) | |
| tree | 30696c133fbbe4ac173b40626b1515929dc7ced6 /Rx/v2/examples/doxygen/zip.cpp | |
| parent | 476dcf0c69e5b0651984e5123c018c0426ac24f0 (diff) | |
| parent | 7db9c5ce026d0582a1fb0ce26f2ef151fe7af2de (diff) | |
| download | RxCpp-6cce4d0f33aef9dab02d697d26219eccc57100d0.tar.gz | |
android: Merge branch 'upstream-master' into master am: bf1edc83fb
am: 7db9c5ce02
Change-Id: I3939bf64f3bb5584008d8e27cfefc34011121f7b
Diffstat (limited to 'Rx/v2/examples/doxygen/zip.cpp')
| -rw-r--r-- | Rx/v2/examples/doxygen/zip.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Rx/v2/examples/doxygen/zip.cpp b/Rx/v2/examples/doxygen/zip.cpp index c5cd07b..6bd295b 100644 --- a/Rx/v2/examples/doxygen/zip.cpp +++ b/Rx/v2/examples/doxygen/zip.cpp @@ -17,7 +17,7 @@ SCENARIO("zip sample"){ printf("//! [zip sample]\n"); } -std::string get_pid(); +#include "main.hpp" SCENARIO("Coordination zip sample"){ printf("//! [Coordination zip sample]\n"); |