OSDN Git Service

resolved conflicts for merge of eb10ccbc to lmp-dev
authorMarco Nelissen <marcone@google.com>
Thu, 20 Aug 2015 18:45:19 +0000 (11:45 -0700)
committerMarco Nelissen <marcone@google.com>
Thu, 20 Aug 2015 18:45:19 +0000 (11:45 -0700)
commitd4f0d88e701f5323621bd352cf4cbcd14bc349c4
tree61fff244959003be547572314622184b4ae0141a
parentef87594bd821520cdc46e30036c16ee2eb5becb3
parenteb10ccbc9dcab8ec3ee22a1c2b2db4a673c6fdc2
resolved conflicts for merge of eb10ccbc to lmp-dev

Change-Id: I1d3220bcfe53ab6ad9dba87ef8e41b52f3bb1f30