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

Skip to content
Commit 3cadb60b authored by Ryan Prichard's avatar Ryan Prichard Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "[sf] Stop inheriting from std::unary_function"... 

[automerger skipped] Merge "[sf] Stop inheriting from std::unary_function" into main am: 91600505 am: b3d475f8 -s ours

am skip reason: Merged-In Ie16ada6f76bee7d9f248dc8349a095b50777c92d with SHA-1 6a9953b0 is already in history

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



Change-Id: I2d231c654abbc64510aaa1bbc0e313bfc4cefd47
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b923f115 b3d475f8
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment