Merge "Moved channels settings from carrier config to resources" am: 79eddf8c0a am: 54ccaa0e99

am: 562c2febe0  -s ours

Change-Id: Ic0653f9e30511b076620cd778763ff68df985cc0
This commit is contained in:
Jack Yu
2017-08-09 07:40:00 +00:00
committed by android-build-merger

Diff Content Not Available