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

Commit 8b30afbd authored by Akilesh Kailash's avatar Akilesh Kailash
Browse files

resolve merge conflicts of c449ba34 to udc-qpr-dev-plus-aosp 

Ignore-AOSP-First: Cherrypick from AOSP
Bug: 301165896
Test: Build
Change-Id: Ic8585b0d9602a244dc1a14d8d3302db1a93b0799
parents c3b46b16 c449ba34
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment