Commit 5a81e840 authored by Mathieu Chartier's avatar Mathieu Chartier
Browse files

Fix bad auto merge conflict resolution in CC 

We should not be clearing the region space since:
https://android-review.googlesource.com/#/c/294708/

Bug: 12687968

Test: test-art-host CC baker
Change-Id: I78050c61c8cdcc0b777d3324ba3f7ded80b2cf52
parent 1458e0c0
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment