tree e0e66bbc5ab2f2c264109263bfd2780c03e1a854
parent 849e24866d06fef713039cfcf3c67ad4252ecc57
author Jeff Vander Stoep <jeffv@google.com> 1487122338 -0800
committer Jeff Vander Stoep <jeffv@google.com> 1487122338 -0800

Fix bad automerge

Test: Marlin builds again!
Change-Id: Ic0034a5006d22f758daef92994338fdfb00210fc