tree 8b6d5fd08ebce7007ce4a41434bc21b402df9000
parent a1e462e5531db20d1dc70c3e24c82879a0a90870
parent 6035c811849a8475697268cf71b5cf923705abe8
author Nick Kralevich <nnk@google.com> 1439917044 -0700
committer Nick Kralevich <nnk@google.com> 1439917044 -0700

resolved conflicts for merge of 6035c811 to lmp-dev

Change-Id: Icf911f31e207c4c658047f6bfe8088d697b04ed6