tree 5e7ead107eb2e7a847106583ddbf9f9384527d42
parent 7c3212b2f4f2f4b5ee18f2db925db95ee420d489
parent 08c723345110d547729c16075bfda264ca767285
author Bart Sears <bsears@google.com> 1418422797 -0800
committer Bart Sears <bsears@google.com> 1418422797 -0800

resolved conflicts for merge of 08c72334 to lmp-mr1-dev

Used "-s ours" for the merge since this CL had been cherry-picked from
lmp-mr1-dev to lmp-dev so when auto-merging back, we want to keep what
is already in lmp-mr1-dev.