tree c114abddfc172687177308b5ebbda5b130d80118
parent 946e6eedc2e00ef5124f67feac01a453bc8e74e6
parent 62ced9c2d898c25f64db8c07e1db2ff7cf907101
author Meng Wang <mewan@google.com> 1535597693 -0700
committer android-build-merger <android-build-merger@google.com> 1535597693 -0700

Merge "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT" am: d8523f3c01
am: 62ced9c2d8

Change-Id: I8c4a3809036163e855e58ba91779abe2cf5fada6