OSDN Git Service

resolve merge conflicts of 9887f2f50a to lmp-sprout-dev.
authorRobert Greenwalt <rgreenwalt@google.com>
Fri, 18 Dec 2015 03:32:43 +0000 (19:32 -0800)
committerRobert Greenwalt <rgreenwalt@google.com>
Fri, 18 Dec 2015 03:32:43 +0000 (19:32 -0800)
commit5a77651489ace080671034a85e5771c6ddc73525
tree53304798ad430f2179cd851ca0c4482d83435bbe
parent0b542630dd8b4d43f2e4f70563d3e44bb680455f
parent9887f2f50a41043e2105e306b48d2b04277cb128
resolve merge conflicts of 9887f2f50a to lmp-sprout-dev.

Change-Id: I240cac5cba106a7f0fab61e04af2c757b46b0bb0