[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 am: c203a38c83 -s ours

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: I114b0669fe04a39af0d00e3f5ad1964bc7ce5a8e
This commit is contained in:
Bonian Chen
2020-08-03 10:44:24 +00:00
committed by Automerger Merge Worker

Diff Content Not Available