am 4101a365: am c2ccc528: Merge "Make back button exit ConferenceManagerFragment" into klp-dev

* commit '4101a365c72f0e78c3c7695967f2f03950169b79':
  Make back button exit ConferenceManagerFragment
tree: 7d3445577d8e3bc2153eedcc9c4798a22ce808f6
  1. InCallUI/