tree 0c1df96d06aca3a30439726aa33c941a99acf8a7
parent 627d55c9ff4ba689c4138d97b3d887db24ee4a8c
author Alexander Lucas <alexlucas@google.com> 1428444570 -0700
committer Alexander Lucas <alexlucas@google.com> 1428444570 -0700

resolved conflicts for merge of 5c8cae0b to lmp-mr1-dev

Change-Id: I98ff0bc0bd16a23887c67aba0c928e584ccaf726