OSDN Git Service

resolved conflicts for merge of 1a8c6567 to lmp-mr1-ub-dev
authorYing Wang <wangying@google.com>
Thu, 27 Aug 2015 00:03:18 +0000 (17:03 -0700)
committerYing Wang <wangying@google.com>
Thu, 27 Aug 2015 00:03:18 +0000 (17:03 -0700)
Change-Id: Iadb7c55c246705ac10c6822b7bb5d71794ce485b


Trivial merge