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

Skip to content
Commit 1a47a02f 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

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

Change-Id: I97dde629e7af2766f74c5d2bf2dbf8a143825fe5
parents 5353df6c 73f8f501
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