[Panlingual] Fix conflict am: 70fe2d1fdd am: 370840ff0d

Browse Source

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

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

...

This commit is contained in:

Tom Hsu

2022-05-05 19:18:23 +00:00

committed by Automerger Merge Worker

parent 7cb0d26b31 370840ff0d

commit 9b681c34dd

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