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

Skip to content
Commit f0382481 authored by Sungtak Lee's avatar Sungtak Lee
Browse files

[DO NOT MERGE] resolve merge conflicts of... 

[DO NOT MERGE] resolve merge conflicts of f1e06c0a to rvc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Merged-In: I4f79427ceeaec1b823270bbc8f2513ed28ea8f67
Change-Id: Ia262d3b763fe2251d7588a0edfcd00100ac62c01
parents 5555914f f1e06c0a
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