[automerger skipped] Merge "[Settings] Avoid from crash" am: fdb57510cd am: 8ff7f44b2d -s ours am: fb943ee433 -s ours am: 1d6b04d6a7 -s ours am: 71a9f0c4fe -s ours

Browse Source

am skip reason: Change-Id I4008010077c61930487fef01af306ccdfd69e38f with SHA-1 a9de4477e6 is in history

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

Change-Id: I05932e406c0636ad2d879d3214107d2b341cfe32

...

This commit is contained in:

Bonian Chen

2020-08-03 10:30:53 +00:00

committed by Automerger Merge Worker

parent d2e70ce5cd 71a9f0c4fe

commit c203a38c83

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