tree 53304798ad430f2179cd851ca0c4482d83435bbe
parent 0b542630dd8b4d43f2e4f70563d3e44bb680455f
parent 9887f2f50a41043e2105e306b48d2b04277cb128
author Robert Greenwalt <rgreenwalt@google.com> 1450409563 -0800
committer Robert Greenwalt <rgreenwalt@google.com> 1450409563 -0800

resolve merge conflicts of 9887f2f50a to lmp-sprout-dev.

Change-Id: I240cac5cba106a7f0fab61e04af2c757b46b0bb0