tree 500d1f3375e89830ec6d7bbc54fff807d6dce249
parent 124cc534f8adc57c7f6d444b6cb0c6a2654068ab
parent b4a561541614567dcc8fec4ea87e2c05a347375f
author David Christie <dnchrist@google.com> 1470945968 -0700
committer David Christie <dnchrist@google.com> 1470945968 -0700

resolve merge conflicts of b4a5615 to lmp-dev

Change-Id: I1b9ebc398226ead9d7f494c4ac56a7b1d9d6586f