tree 7f2128263bed7f233690940253c884345c41a521
parent 8d135bc9a9be6ee556e92c03bcc7aeb5114e8624
parent d7196d57b08b9fbf9756bf65c16b00cb63ba071e
author SongFerng Wang <songferngwang@google.com> 1639122157 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639122157 +0000

[automerger skipped] Merge "[Settings] Avoid crash from rotation screen." am: 04e416d68c am: 095e4093b0 am: 80aafc5629 -s ours am: d7196d57b0 -s ours

am skip reason: Merged-In Ie25b2ab4284d47abdd5db23676d05b6d547b2a73 with SHA-1 e53d70babc is already in history

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

Change-Id: Ib0c4d22e3067f462f9ef4854880fb828732a5124