Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19a4703e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "MPEG4Writer: remove duplicate include" am: 49ada8fa am: de4cadb1...

Merge "MPEG4Writer: remove duplicate include" am: 49ada8fa am: de4cadb1 am: fa888e36 am: 52921c5b am: 53633dd6 am: a2febabd

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2584556



Change-Id: I32580ef9bd46130da7f6760c536078f27a06b7a2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a61a56b4 a2febabd
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@
#include <utils/Log.h>

#include <functional>
#include <fcntl.h>

#include <media/stagefright/MediaSource.h>
#include <media/stagefright/foundation/ADebug.h>