tree 286af4f39447ab08a44b4a07cdef22358e01a85a
parent 7dd5eb3d189682ab1f7c5e62b03cb1e2afe3829d
parent 682295fe67dfc13613fb165cf4f844ec15c52e6a
author Sunny Goyal <sunnygoyal@google.com> 1533790834 -0700
committer android-build-merger <android-build-merger@google.com> 1533790834 -0700

Merge "Fix overlapping FloatingViewType IntDef" am: c73828fd96 am: ad61ce0767 am: bc742b6a4f
am: 682295fe67

Change-Id: Iec36c374dfbed1ef18a80ee79bec1cdc56fa8143