tree 24ac068a95d5c23621639cd4aadc2c39747415d8
parent 3ae283e75e2e9663bad665e1d259376d1c95b3ec
parent 99b36bd8d3c48536df39f5602ae631029af99505
author Jordan Liu <jminjie@google.com> 1563228805 -0700
committer android-build-merger <android-build-merger@google.com> 1563228805 -0700

Merge "CarrierConfigLoader shouldn't use unsupported APIs" am: c5f00272f6 am: ecfc68f399
am: 99b36bd8d3

Change-Id: Ie0dbe05ef989fc7c90960c8351fda58a9d10cb83