tree 61fff244959003be547572314622184b4ae0141a
parent ef87594bd821520cdc46e30036c16ee2eb5becb3
parent eb10ccbc9dcab8ec3ee22a1c2b2db4a673c6fdc2
author Marco Nelissen <marcone@google.com> 1440096319 -0700
committer Marco Nelissen <marcone@google.com> 1440096319 -0700

resolved conflicts for merge of eb10ccbc to lmp-dev

Change-Id: I1d3220bcfe53ab6ad9dba87ef8e41b52f3bb1f30