tree af79385d32a1b0048a74ad773883d20d03247f43
parent d2b4be098d05549dfb3d7f96f179dd42eeb3e271
parent 8f0335fdec4360f4b78481c9843e9c4513504cde
author Derek Sollenberger <djsollen@google.com> 1524681291 -0700
committer android-build-merger <android-build-merger@google.com> 1524681291 -0700

Merge "Temporarily allow StackView to use a canvas.clipRectUnion" into pi-dev am: 7a7b2369fe
am: 8f0335fdec

Change-Id: Id22c0ad948b9aecfc0844ab0ad9b0d9eb376febb