OSDN Git Service

resolved conflicts for merge of 7cc8f9aa to lmp-mr1-ub-dev
authorVladimir Marko <vmarko@google.com>
Thu, 4 Jun 2015 09:53:59 +0000 (10:53 +0100)
committerVladimir Marko <vmarko@google.com>
Thu, 4 Jun 2015 09:54:48 +0000 (10:54 +0100)
Change-Id: I6203b6d8be029440f635b9575559ba6add9a46d6


Trivial merge