tree e51d1d01c994dc9e2548c3506183a4b0502d4e98
parent aad3359e8eb3e5d28954f88bda8147bcb1d74236
parent 7b5834d9b1f09d42cea4d8f052e18ce87fea8187
author Sunny Goyal <sunnygoyal@google.com> 1533756294 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1533756294 +0000

Merge "Fix overlapping FloatingViewType IntDef" into ub-launcher3-master