tree 264f1abd857d9149df8a618a22355a8001caa3c8
parent e9a8f465859137ba37786031b804864205900cb4
parent 2bcfbe7e88a64282aaa9e341988f40c24dfa50b3
author Tao Bao <tbao@google.com> 1440544681 -0700
committer Tao Bao <tbao@google.com> 1440544681 -0700

resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-dev

Change-Id: Ia53581aee207b0a24807767d7e80959a4fc9aff3