Merge "Fix crash with LayoutTransition and ViewOverlay collision"

 */

package android.view;

import android.animation.LayoutTransition;

import android.content.Context;

import android.graphics.Canvas;

import android.graphics.Rect;

                    child.offsetTopAndBottom(parentLocation[1] - hostViewLocation[1]);

                }

                parent.removeView(child);

                if (parent.getLayoutTransition() != null) {

                    // LayoutTransition will cause the child to delay removal - cancel it

                    parent.getLayoutTransition().cancel(LayoutTransition.DISAPPEARING);

                }

                // fail-safe if view is still attached for any reason

                if (child.getParent() != null) {

                    child.mParent = null;

                }

            }

            super.addView(child);

        }