Commits
Sailesh Nepal authored and Android Git Automerger committed de7b60a19beM
am 849dfc35: am 20fab81a: Merge "Fix crash when doing conferencing over Wi-Fi" into mnc-dev * commit '849dfc35bcad75119516d786c20d3df74eb946bf': Fix crash when doing conferencing over Wi-Fi
Showing diff to8e7012a84d4