[Pnalingual] Resolve code conflict. am: 6436a5aa6f am: 715ebf4705 am: 8d2c67bd03

Browse Source

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

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

...

This commit is contained in:

tom hsu

2022-04-06 12:22:36 +00:00

committed by Automerger Merge Worker

parent 58bd2faec6 8d2c67bd03

commit 2473634d72

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