tree edbbda3d356f719cf78f727d8c26816a56c8a385
parent ead6e4e92f0fa66ed87306acbb2a79e5e630f336
parent b4b597a4ff5d6bd786cd8771dfc3a192a100b181
author Zak Cohen <zakcohen@google.com> 1559082246 -0700
committer android-build-merger <android-build-merger@google.com> 1559082246 -0700

Merge "Chips container - Don't hard code the height of the chips container." into ub-launcher3-qt-dev am: b36ab46e93
am: b4b597a4ff

Change-Id: I7afe34cd8a4867dcb340e65fe6608b030f681b39