OSDN Git Service

resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-dev
authorTao Bao <tbao@google.com>
Tue, 25 Aug 2015 23:18:01 +0000 (16:18 -0700)
committerTao Bao <tbao@google.com>
Tue, 25 Aug 2015 23:18:01 +0000 (16:18 -0700)
commitc6e087adc420ca08bfea8613c07aa51e1b4a2e3e
tree264f1abd857d9149df8a618a22355a8001caa3c8
parente9a8f465859137ba37786031b804864205900cb4
parent2bcfbe7e88a64282aaa9e341988f40c24dfa50b3
resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-dev

Change-Id: Ia53581aee207b0a24807767d7e80959a4fc9aff3