OSDN Git Service

resolved conflicts for merge of fad2cbf9 to lmp-mr1-ub-dev
authorVladimir Marko <vmarko@google.com>
Thu, 4 Jun 2015 09:59:53 +0000 (10:59 +0100)
committerVladimir Marko <vmarko@google.com>
Thu, 4 Jun 2015 09:59:53 +0000 (10:59 +0100)
commite279c0c4e9ecc464ab10c9d9cd3404c3b0ed6845
tree65cc0394a15ea82df9ccb680b1ec6b3be72a1a87
parentfb695b34268bb7f9270f07ecaac554e49b5b6a92
parentfad2cbf97c71b9742ccd88cc1a5ba13fa918e677
resolved conflicts for merge of fad2cbf9 to lmp-mr1-ub-dev