tree f92dd12124e6ba9857d581f3e70c331909d6a4a5
parent acaffe609cb75a70426a7eabca83b6fc9538c132
parent c73828fd96acc71fb7decbfbd392dada4a7cfeb1
author Sunny Goyal <sunnygoyal@google.com> 1533757153 -0700
committer android-build-merger <android-build-merger@google.com> 1533757153 -0700

Merge "Fix overlapping FloatingViewType IntDef"
am: c73828fd96

Change-Id: I2b5f60a83ed1f07050f95f4c4240682f7ec480f6