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

Skip to content
Commit c160d2d7 authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Revert "NuPlayer: use acquireWakeLockAsync in... 

[automerger skipped] Merge "Revert "NuPlayer: use acquireWakeLockAsync in AWakeLock"" into tm-dev am: 71d536bf am: 5080d762 am: 87120cb0 -s ours

am skip reason: Merged-In Ice44a818c8c18e42008eb5271d37d263fee57484 with SHA-1 781a7fd3 is already in history. Merged-In was found from reverted change.

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

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



Change-Id: I072d5e635b29e2d37cac1bd51970668a8214ffd4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b4222e36 87120cb0
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment