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

Commit 2473634d authored by tom hsu's avatar tom hsu Committed by Automerger Merge Worker
Browse files

[Pnalingual] Resolve code conflict. am: 6436a5aa am: 715ebf47 am: 8d2c67bd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615234



Change-Id: Ic9e8da3d581b12f657576825a81d844808205543
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 58bd2fae 8d2c67bd
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