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

Skip to content
Commit 04c4364e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "allow standby function in the DRAINING and... 

[automerger skipped] Merge "allow standby function in the DRAINING and TRANSFERRING states" into main am: e7e84f95 am: 38801f75 -s ours

am skip reason: Merged-In I71e306f65d6a3730224a1d6375f62e3f952dcebc with SHA-1 6713689c is already in history

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



Change-Id: I83b8a9a3ae6cc97f9229b980af45351e20ba67ed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8b898274 38801f75
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