tree 3d4c714596a3204595ce5df0890fcff3094b4887
parent ec986ac944caa60dbbf882c159564b772c0e95b0
parent 1081a15fd469cc9fdc1d0f02fc44df537ce48289
author David Christie <dnchrist@google.com> 1471994391 -0700
committer David Christie <dnchrist@google.com> 1471994391 -0700

resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev

Change-Id: Ic44c577ef364bf81dd1e30b50c71718d4910eb10