OSDN Git Service

resolved conflicts for merge of 0a7fcb00 to lmp-mr1-dev
authorYing Wang <wangying@google.com>
Tue, 11 Nov 2014 00:07:40 +0000 (16:07 -0800)
committerYing Wang <wangying@google.com>
Tue, 11 Nov 2014 00:07:40 +0000 (16:07 -0800)
commit461850dab19ea4b9552d079aa6c80f4bbbef6ab5
tree7ab76b2ad5ed6b094dbc50f3dfb0d6b533ce9b33
parenteb83a3ed7470bc931c24d4d38f696e9cc33c034a
parent0a7fcb00abc2887e5fdd9718c85957f2b4556c8e
resolved conflicts for merge of 0a7fcb00 to lmp-mr1-dev

Change-Id: Ia780b29bfc9a7b3409bf04ba0e18e937c9467a0f