am 198a2553: Merge "Ensure IMS is turned On or Off when synchronizing settings with...
authorPavel Zhamaitsiak <pavelz@google.com>
Wed, 9 Sep 2015 17:18:39 +0000 (17:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Sep 2015 17:18:39 +0000 (17:18 +0000)
commitdeff4be65cc9a052f73997df47b43031329c335f
tree19a9ee842539f25d560ef35fecd0b42c745282b3
parentf35f867398d41594b7c6d99978d4f42b77ce1551
parent198a2553edd7182ee0da5df306016bbe7f427c0a
am 198a2553: Merge "Ensure IMS is turned On or Off when synchronizing settings with ImsConfig" into mnc-dr-dev

* commit '198a2553edd7182ee0da5df306016bbe7f427c0a':
  Ensure IMS is turned On or Off when synchronizing settings with ImsConfig
src/java/com/android/ims/ImsManager.java