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)
commitfc168f84695f492f2ad0eed3063145f425bebf45
treefbff119ff8045ee84dae5ed3a425018af76d7680
parent1e120181f0a9240eca61dface4fb4530bf2594ab
parent1a8c656704d949e14a4951d31a14b9a235eebe49
resolved conflicts for merge of 1a8c6567 to lmp-mr1-ub-dev

Change-Id: Iadb7c55c246705ac10c6822b7bb5d71794ce485b