OSDN Git Service

resolved conflicts for merge of e8a4b652 to lmp-mr1-ub-dev
authorVladimir Marko <vmarko@google.com>
Thu, 4 Jun 2015 10:14:23 +0000 (11:14 +0100)
committerVladimir Marko <vmarko@google.com>
Thu, 4 Jun 2015 10:14:23 +0000 (11:14 +0100)
commitb8154d5cc707921fadf92fedc65a66a3e8901126
tree65cc0394a15ea82df9ccb680b1ec6b3be72a1a87
parent5d3acebd1fe859cbf6fb3831815eb7f3c1f3e442
parente8a4b6529634abced15ef419b0733ea11693cecb
resolved conflicts for merge of e8a4b652 to lmp-mr1-ub-dev