tree 8d83ab0e105fbd221161565be94cb235f560316a
parent 1cdd654ecedd92ed72c176c269856b9047ae3e1f
parent b13235522bd7d59f9b1707fb1e352e7e6c4c5c57
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576209564 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576209564 +0000

[automerger skipped] Merge "Supplementary Services(SS) gray out when airplane mode on in Call Settings menu." am: 4e62c65a0d am: 696a6544f9 am: b13235522b -s ours
am skip reason: Change-Id I8f75dd0f3b8d63f9ce787921cc3e739f82528167 with SHA-1 022b5da707 is in history

Change-Id: I745c4e4d6b101f19b0c89a3be77ccc0b1b67c7cc