tree 16c955bd9ef3b44ff258d9f8f0586e8ec310a264
parent aa72909837dc30ed8314b91fe93645f2c3cdd677
parent f092f12bc526c7b8ddea7f91979e3e21b09148e6
author Jordan Liu <jminjie@google.com> 1527872485 -0700
committer android-build-merger <android-build-merger@google.com> 1527872485 -0700

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

Change-Id: I6c3cad5896c38e6f66d19f2696ded7aa589baec5