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

Commit 47866840 authored by Ryan Prichard's avatar Ryan Prichard Committed by Automerger Merge Worker
Browse files

Merge "inputflinger: add missing <functional> include" into main am:...

Merge "inputflinger: add missing <functional> include" into main am: 3508150e am: 041b86fe am: 0c50c023

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2758333



Change-Id: Ia1d7f6c7803c0f24fe0b060ce2f10ae2a3018b23
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 87300af1 0c50c023
Loading
Loading
Loading
Loading
+2 −1
Original line number Original line Diff line number Diff line
@@ -16,10 +16,11 @@


#pragma once
#pragma once


#include "android-base/thread_annotations.h"
#include <condition_variable>
#include <condition_variable>
#include <functional>
#include <mutex>
#include <mutex>
#include <vector>
#include <vector>
#include "android-base/thread_annotations.h"


namespace android {
namespace android {