[Panlingual] Fix conflict am: 70fe2d1fdd am: fd09e5c0e8

Browse Source

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

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

...

This commit is contained in:

Tom Hsu

2022-05-05 09:27:22 +00:00

committed by Automerger Merge Worker

parent 1c154f9197 fd09e5c0e8

commit e8e612c7d5

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