tree 0f52d538a02fa9b5e56bffa9b8fbbff7f63b0045
parent b9b216294178d0b6c23fca88d16dd02bfcbf218a
parent e288472122a790157d26a8cda2ac8c3487ddd7c6
author Brad Ebinger <breadley@google.com> 1510159901 +0000
committer android-build-merger <android-build-merger@google.com> 1510159901 +0000

Merge "Switch class hierarchy of ImsServiceProxy and compat" am: 7805de4002 am: 90f22d4bf6
am: e288472122

Change-Id: Icde853dde9257a0314b0ebe1619edb7eb55d216d