tree 1ef21df2eb2c7728419ca2748e23ffd4c7b62d02
parent 6aba5501a078c767ddb7c01f8e36efe683a7f68f
parent ecfc68f399cb32b4a6c32438f3100dbc08a99bd2
author Jordan Liu <jminjie@google.com> 1563227940 -0700
committer android-build-merger <android-build-merger@google.com> 1563227940 -0700

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

Change-Id: I838d9757da581953dcb14befb33e01420c85801a