| commit | a72ef28f8cc2b894119b470fe6c93d1abe566398 | [log] [tgz] |
|---|---|---|
| author | Brian C. Anderson <brianderson@google.com> | Mon Jan 16 21:01:10 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jan 16 21:01:11 2017 +0000 |
| tree | 0e143e9febbff192e130cc9807f398f10e7e2402 | |
| parent | 334d7a0d8a8d1f263f9211d2e2374753e064fdc6 [diff] | |
| parent | f675356f9e275b9a52101a997ad20404922b5147 [diff] |
Merge "Clean up Fence a little."
diff --git a/camera/camera2/OutputConfiguration.cpp b/camera/camera2/OutputConfiguration.cpp index 12d0da8..f4f2229 100644 --- a/camera/camera2/OutputConfiguration.cpp +++ b/camera/camera2/OutputConfiguration.cpp
@@ -21,8 +21,9 @@ #include <utils/Log.h> #include <camera/camera2/OutputConfiguration.h> -#include <gui/Surface.h> #include <binder/Parcel.h> +#include <gui/Surface.h> +#include <utils/String8.h> namespace android {
diff --git a/media/libstagefright/filters/GraphicBufferListener.cpp b/media/libstagefright/filters/GraphicBufferListener.cpp index c1aaa17..db061c1 100644 --- a/media/libstagefright/filters/GraphicBufferListener.cpp +++ b/media/libstagefright/filters/GraphicBufferListener.cpp
@@ -22,6 +22,7 @@ #include <media/stagefright/MediaErrors.h> #include <gui/BufferItem.h> +#include <utils/String8.h> #include "GraphicBufferListener.h"