OSDN Git Service

resolved conflicts for merge of eca016eb to lmp-mr1-ub-dev
authorMohamad Ayyash <mkayyash@google.com>
Thu, 18 Jun 2015 23:19:06 +0000 (16:19 -0700)
committerMohamad Ayyash <mkayyash@google.com>
Thu, 18 Jun 2015 23:19:06 +0000 (16:19 -0700)

Trivial merge