tree 6a57aae15d3483c64fdd1a8b0d0905ee16d6bf5c
parent 42eec15834dac78c408437c6a707c34cbadb2aac
parent 37e02742a43639ee15abda2b54169f3e1b060681
author Bonian Chen <bonianchen@google.com> 1574819346 -0800
committer android-build-merger <android-build-merger@google.com> 1574819346 -0800

Merge "IMS: Grey out Wifi calling option when either sub is having call." am: 262b4f7434
am: 37e02742a4

Change-Id: I81eac0ecd2948e7b5bd6b92ae90b349ab46675e7