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

Skip to content
Commit 088b1edf authored by Fiona Campbell's avatar Fiona Campbell Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Revert "MTP: add a new parameter for cancelEvents... 

[automerger skipped] Merge "Revert "MTP: add a new parameter for cancelEvents function"" into sc-dev am: d828b8f1 -s ours am: 4bcd00ee -s ours am: bfccf421 -s ours

am skip reason: Merged-In I4e172fa62c297ac33b0c97c67f3f7baa817fd8bf with SHA-1 305e62ec is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/14910151

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

Change-Id: I2038596c43b3152ce59899ae58f53799c82f65d5
parents 643b12f2 bfccf421
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