tree 337e284bd259a69bee061c122c2c2d9038430a1b
parent c08cfb1391459f3d3e8a517e4e0ab8ea79ef9e19
author Mads Ager <ager@google.com> 1532091821 +0200
committer Mads Ager <ager@google.com> 1532091821 +0200

Update non-class splitting to put conflicting files in base.

R=christofferqa@google.com, spollom@google.com

Bug: 111082605
Change-Id: Ie49eac417c6197db6ab0dd1f3513dd7b94ff227e