tree de076d66c45f37a06663356907854f36a4d51b63
parent 6f78aeecbb8de6a27fc8aa1c15902cf6ffa35aa6
parent d807724de2cd462dd9ba51a5cb80124d94984f91
author Tony Wickham <twickham@google.com> 1554938212 -0700
committer android-build-merger <android-build-merger@google.com> 1554938212 -0700

Merge "Track window for 2 button nav as well as 0 button" into ub-launcher3-qt-dev
am: d807724de2

Change-Id: Ieb4b6a6afdbf308e521480ad1bf72c30da19e2f3