tree 150ed42205f23a48a33f57a49f4fa9915566689a
parent 6434965a08bb4cef4c2c6e9d69ed90b84195500b
parent 74c0891bc7799f28d69a19cf0ad9e123d133cd63
author Malcolm Chen <refuhoo@google.com> 1514416019 +0000
committer android-build-merger <android-build-merger@google.com> 1514416019 +0000

Merge "Fix issue that Wifi Calling preference is showing wrong value." am: 84bf5c765c
am: 74c0891bc7

Change-Id: Ibe51ff35d007503632289f2adeccd1ec24c9eed1