tree b2553487f2078f5bf23737932dcdc7f450e0ba92
parent 3695646987bda474c5936d2d86206c11aefce4d9
parent 72c6e7b73651dcb0c3cacd12a284a8f3a42cd436
author Tony Wickham <twickham@google.com> 1559345199 -0700
committer android-build-merger <android-build-merger@google.com> 1559345199 -0700

Merge "Fix getting stuck in BackgroundAppState for 2-button mode" into ub-launcher3-qt-dev
am: 72c6e7b736

Change-Id: I6ab2194d50a6d7dfb7bd7c13bab776331c426c23