Merge "Make setting and unsetting InCallPresenter.mInCallActivity more robust" into lmp-mr1-dev
tree: 731061eba196008a96d34859e11b6bb4458ff669
  1. InCallUI/