tree 986fc89933b1933210f078cd2e470c8d6363c41b
parent 236ef051fded62e9c6ec1196c99f2f30a09ca2f8
parent 49e72ac059ea24642c07e0a4046f7d7964c4a65c
author vadimt <vadimt@google.com> 1573683198 -0800
committer android-build-merger <android-build-merger@google.com> 1573683198 -0800

[automerger skipped] Merge "Tapl: AllApps: ensuring a minimal vertical size of an icon" into ub-launcher3-qt-future-dev
am: 49e72ac059 -s ours
am skip reason: change_id I19e3ba7cfa25de75a47202845d0838bea46af92c with SHA1 480083490f is in history

Change-Id: I615cd69e7442139be0270ed655c578a29a799233