tree ec7e8becbaaf7cf159be9417570031ce5afeb55c
parent aab8998d6e38ee771aa5c1ca06691b9bad7c141c
parent d9d80c625710686ec055c902077003450748a313
author Garik Badalyan <garikb@codeaurora.org> 1460044968 +0000
committer android-build-merger <android-build-merger@google.com> 1460044968 +0000

Merge "IMS-VT: Show Answer UI on receiving upgrade request" into nyc-dev
am: d9d80c6

* commit 'd9d80c625710686ec055c902077003450748a313':
  IMS-VT: Show Answer UI on receiving upgrade request

Change-Id: Icb25b8de877d3eb7f1d9703368afd88c2edc09fe