resolve merge conflicts of 8786016e to rvc-qpr-dev
Bug: 168802517 Change-Id: I84db4b2328ecdd40991f661f23f635f4dd1a42ab Merged-In: I3e6ba1d8645335785e8e26cdc895ea9c0017a0fd
Loading
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Bug: 168802517 Change-Id: I84db4b2328ecdd40991f661f23f635f4dd1a42ab Merged-In: I3e6ba1d8645335785e8e26cdc895ea9c0017a0fd
mentioned in commit 2121a1b2