am c7457fe1: Merge "Swap calls when clicking on secondary photo in InCallUI" into master-nova

* commit 'c7457fe1e11cd8ed74c02a40a38cf56e3d4fbb90':
  Swap calls when clicking on secondary photo in InCallUI
tree: 4ec99d2904df96799f2a21c1eb296fdf0485f676
  1. InCallUI/