tree dbc8a45720d85ecd872d722ade31930b644ffb20
parent 70ec2a4213fd622567af1266c0d2a163f8ff6a67
parent 7241d7cfe539fd2b76f97ce91b0d1040b5514a70
author Sunny Goyal <sunnygoyal@google.com> 1559606801 -0700
committer android-build-merger <android-build-merger@google.com> 1559606801 -0700

Merge "Removing user locked change in LauncherAppState" into ub-launcher3-qt-dev am: ce0c093133
am: 7241d7cfe5

Change-Id: I673d348e511fca5c1798d2c2a26800f6eb5f2a19