tree e423ded2eb083598399eb0834b1a8633909b5e96
parent 76fe0c3e3ccd1da9f4d9e4ddcd960d61aa6d205f
parent bacc582817faff95e3d4b7fef8220360e6a83ad7
author Jon Miranda <jonmiranda@google.com> 1497918452 +0000
committer android-build-merger <android-build-merger@google.com> 1497918452 +0000

Merge "Portrait grid changes for Workspace/All Apps." into ub-launcher3-dorval-polish
am: bacc582817

Change-Id: Id332cf749a7dd46993786668437409da886c4258