tree 286af4f39447ab08a44b4a07cdef22358e01a85a
parent 1cbe8241674fca4d980731fca210d2cbe0a0ab7c
parent bc742b6a4fbbcb523a8d0504171b9c2c51fecf90
author Sunny Goyal <sunnygoyal@google.com> 1533759272 -0700
committer android-build-merger <android-build-merger@google.com> 1533759272 -0700

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

Change-Id: Ibc1f1c11268527e6b8b5f690a7e781885a554e2f