tree a6f1746c8f19923648882f5f3e80b4666b8045b2
parent e9bd061bce7861913540bb9248661be1f9f9a7cb
parent 86cdc8f3301a6e656feb3ddb71e05dbc7dca15ae
author Jordan Liu <jminjie@google.com> 1475190066 +0000
committer android-build-merger <android-build-merger@google.com> 1475190066 +0000

Merge "Remove migrated config_carrier_wfc_ims_available" am: 5d71e2d671
am: 86cdc8f330

Change-Id: Ib3a4b1bf5eb649a67885c035e1222560b67926c7