tree 37f916c43ca847c9d6ba43e390ce2e341f6db801
parent f7e9b051b5eb4274efabb27c06a36c3c94ac5773
parent 315732e524ca49a3a969a238e299ee853cc16cd2
author Jonathan Miranda <jonmiranda@google.com> 1568744721 -0700
committer android-build-merger <android-build-merger@google.com> 1568744721 -0700

Merge "Support defining X column layout for all apps as a display option." into ub-launcher3-qt-future-dev
am: 315732e524

Change-Id: I1c47d689fbec052859d5fdbfcf8d10b07ddd0202