tree c4793e62d2e7fc3c8413f21604b0a2ce87cfa976
parent f27d0c293560d0e55a927a061b73f0dbfbb0e24b
parent 05727f206b1a173820e08e2c79437461c14ab653
author Bonian Chen <bonianchen@google.com> 1631271789 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631271789 +0000

[automerger skipped] Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" am: 4c3f454c92 -s ours am: 6c1c8934a2 -s ours am: 58d30bf442 -s ours am: d010033f00 -s ours am: 05727f206b -s ours

am skip reason: Merged-In Ibf4d17aa493f69a3f00e35ae0e9d1419bd9e0d77 with SHA-1 f56682808e is already in history

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

Change-Id: I91e6577c8e3e716b13654c1f7ecfc6d1c9f59a98