tree 72ff0cfa732fe33539aee177a602fac71de9d5c4
parent 44787b6aa7e28fc20708f820c602e3327f17ce6f
parent b0896e61f8f65be69fa0a0eed2e42421c08fe92a
author Ian Zerny <zerny@google.com> 1535622681 -0700
committer android-build-merger <android-build-merger@google.com> 1535622681 -0700

Merge "Revert "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT""
am: b0896e61f8

Change-Id: I356bd75a0d1b0a0334cde5703a9ce7a24874bed4