Modifies ImsManager to support ImsResolver am: 14b0a9e7ee am: 77e79e53e6
authorBrad Ebinger <breadley@google.com>
Fri, 17 Feb 2017 20:33:30 +0000 (20:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Feb 2017 20:33:30 +0000 (20:33 +0000)
commit1bb9b102843325173e823b0327312894adf23368
treedce1075e85aeb943fd0d71bb39fb59e8a569bdba
parent16780ffb8b0f206e476bd6b68d06af61506b4a87
parent3b0513a12010ba06efda40dedce444aac0591345
Modifies ImsManager to support ImsResolver am: 14b0a9e7ee am: 77e79e53e6
am: 3b0513a120  -s ours

Change-Id: Ied385017a92bd1061f32d03fe9c46dc69c28a0c4