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

Commit 8d2c67bd authored by tom hsu's avatar tom hsu Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I2e252e7b93bc3587fbfeb0e8152fbc16ad6c0f42
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8180a6e3 715ebf47
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