tree 6917d8b3c34a61266475753794f803ea5429af49
parent 1e8b2747c7c021dad4f1c68f64526fbc5a1972ab
parent f7e37679d1d20ac3c0e6fae7060269fcb51d5e52
author Unsuk Jung <unsuk@google.com> 1441918173 -0700
committer Unsuk Jung <unsuk@google.com> 1441918173 -0700

resolved conflicts for f7e37679 to lmp-dev

Change-Id: Ibdf7ac319e724cc703cdade3b1ce83155ebb15df