tree 04c3ec6eade5d53efb0e38d835a1c0cbe7ef3921
parent 94335a3f2869c01c19abb00121f4762069c239d0
parent 15f2b9faaacc05aab9246446d74f65d111598b60
author Malcolm Chen <refuhoo@google.com> 1515814602 +0000
committer android-build-merger <android-build-merger@google.com> 1515814602 +0000

Merge "Replace ImsManager static methods with proper ones." am: 112d2dae49
am: 15f2b9faaa

Change-Id: Ib3a8c8d88cd4850abda33df2eda61b253c2e8270