tree 2b7a4ddeaaa8311766bdf999ca77d6677c8373cb
parent b66feeffac70ecfca2e594494be6b5abc61de3c1
parent a6bfd8d12c2397f34940d0cb812cb0820256c8b6
author Chris Craik <ccraik@google.com> 1476734372 +0000
committer android-build-merger <android-build-merger@google.com> 1476734372 +0000

Fix complex clipping on mergeable ops DO NOT MERGE am: d183e0b988
am: a6bfd8d12c

Change-Id: I5af8d0fac1e47e7bf831ca2f387fe550acf4165c