tree f3c1886bfd40d4e03906147a4bf2118ea1053ef5
parent de46691852c7884d18805cdfda77558b6c7713bb
parent 156c93baa5f59c7569c2641f176b80a3bea4ca06
author Jordan Liu <jminjie@google.com> 1527871394 -0700
committer android-build-merger <android-build-merger@google.com> 1527871394 -0700

Merge "Default and CarrierApp Carrierconfigs are separate" into pi-dev
am: 156c93baa5

Change-Id: I22945f36c03e9f532df635684d06331be2bba71b