[Panlingual] Fix conflict am: 70fe2d1fdd am: c4603be5b3 am: e74b7edb7c am: 1d8e73ab2c

Browse Source

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

Change-Id: I22d6d85d9d0f206b9989b4c8934e0fcf3150342c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Tom Hsu

2022-05-05 10:30:38 +00:00

committed by Automerger Merge Worker

parent afd9e67e05 1d8e73ab2c

commit bfffc06157

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available