diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2016-10-26 16:46:46 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2016-10-26 16:46:46 -0700 |
| commit | 5a81e84013eeb4ba143747b044ed9ab4e5a33ab5 (patch) | |
| tree | f27628d7b53ceea899c6e5d723124b30f96df747 /test/008-exceptions/src-multidex/MultiDexBadInitWrapper2.java | |
| parent | 1458e0c09fe0a3b9fa5fd7beb9b6077d1fc46b1d (diff) | |
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
Diffstat (limited to 'test/008-exceptions/src-multidex/MultiDexBadInitWrapper2.java')
0 files changed, 0 insertions, 0 deletions