tree f52b947ae8185974a2a1d9486524b54ff8e6d528
parent 9629b349b90bc069bd8c98eaa87c51534a57bfbf
parent 571ab06ec047a1893be85cd807a8b13bd0f9fe21
author Winson Chung <winsonc@google.com> 1556578892 -0700
committer android-build-merger <android-build-merger@google.com> 1556578892 -0700

Merge "Only migrate 2-button setting if set" into qt-dev
am: 571ab06ec0

Change-Id: I90c8f91cfe29fe2dbb63abab95bf9404fcee63fc