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

Skip to content
Commit 01432970 authored by Lajos Molnar's avatar Lajos Molnar Committed by Automerger Merge Worker
Browse files

resolve merge conflicts of ae811bc8 to... 

resolve merge conflicts of ae811bc8 to rvc-dev-plus-aosp am: 7a3434e0 am: 73f8f501 am: 1a47a02f

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12292179

Change-Id: I5efe72efc1fa4e76d24e4bc727a138bff640c43c
parents b2cf1ccc 1a47a02f
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