tree 286af4f39447ab08a44b4a07cdef22358e01a85a
parent 444b52a18fbc84992ca6c56569e996fd4ecba1d7
parent ad61ce0767fe85d62b8c94001520bd4fd28f6a98
author Sunny Goyal <sunnygoyal@google.com> 1533757398 -0700
committer android-build-merger <android-build-merger@google.com> 1533757398 -0700

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

Change-Id: Id87a75c690131e1c2e2ac48f5a07dd89fb6976ca