am ac586a2f: am 9ffb2351: am d4a395b0: Merge "Don\'t let touches in ConferenceManagerFragment fall through" into lmp-mr1-dev

* commit 'ac586a2f496c85770faf070385e4277a7314dafa':
  Don't let touches in ConferenceManagerFragment fall through
tree: 4dbf157580287d0ac63782b86ad85b45e4c87d8a
  1. InCallUI/