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

Browse Source

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

Change-Id: I29f2a85b41db7facafec1a6c091dfe94ce3a8f93
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:50:54 +00:00

committed by Automerger Merge Worker

parent 7c2d110559 e74b7edb7c

commit 1d8e73ab2c

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