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

Commit aecb6212 authored by Issei Suzuki's avatar Issei Suzuki
Browse files

resolve merge conflicts of fc3491bd to sc-v2-dev 

Test: atest ActivityRecordTests
Bug: 184107777
Change-Id: I993dad973ea4b273f77df5671a93cbfd9b21e808
Merged-In: I50a0f3a8ea49beb5c86fff0f6bb8c005db581a6d
parents 534ea6b9 fc3491bd
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