tree e82e90d8e4eab982047dd6411fb6eb79eba6f7dd
parent e35adbc4d23c06fc1d35490a2a16516817bce3f3
parent f2ebbd135625b5c67c69fe9b4c3fd232bb397616
author Malcolm Chen <refuhoo@google.com> 1515009156 +0000
committer android-build-merger <android-build-merger@google.com> 1515009156 +0000

Merge "Move Ims related settings from global setting to subscription db."
am: f2ebbd1356

Change-Id: Ifc49cccd9f9ce47585367a3f0802ced5df94140b