tree e28ded55c4084050d29bb0679778ae918ecf928a
parent ba4e6a804d2ac4577daa2f2db68857e1b01ce3bf
parent 7c327194fec3e5636cedb902fbdfefd77c4ed7b0
author Bart Sears <bsears@google.com> 1440619168 -0700
committer Bart Sears <bsears@google.com> 1440619168 -0700

resolved conflicts for merge of 7c327194 to lmp-mr1-ub-dev

Change-Id: I236367bd60046ba06669cbcdae81184f9d0a74c7