tree eefcc68d7cb9d0438d3bfa759de02521bf110cde
parent a6c9d28833a263cbaa0bd46bedb4c90dc426dd4f
parent 5656ddc11aaa95b4d7ac291d2c8da7b40cb6bef8
author Youming Ye <paulye@google.com> 1537556355 -0700
committer android-build-merger <android-build-merger@google.com> 1537556355 -0700

Merge "Fix wrong call forwarding preferences are displayed in multi-window mode" am: e49d86b0cb
am: 5656ddc11a

Change-Id: I1df6605d6a3df2857ef5a9dc90805965e5687e53