tree 9aab9b8f9461ed7fc64eeed2ac4bb825aed74687
parent 9ca7fa8993bceb97a6256b60742eeda2f699560b
parent f86e7eeabc9721034d2c4af3b2827d93c2d23f6b
author Simon Wilson <simonwilson@google.com> 1435185747 -0700
committer Simon Wilson <simonwilson@google.com> 1435185747 -0700

resolved conflicts for merge of f86e7eea to lmp-mr1-ub-dev

Change-Id: I746021aa57edd5f6fae6e57cec0908951a659664