tree 8b3dd59cc8fe096096d2ebdb520654e9ba775930
parent 79770b192771b7e332f1537fef3e3719b07bcf14
parent 24cfbfabb760c366c3e8f6bff921d3d9a977adcf
author Zach Jang <zachjang@google.com> 1466557997 -0700
committer Zach Jang <zachjang@google.com> 1466557997 -0700

resolve merge conflicts of 24cfbfa to lmp-dev

Change-Id: I5a634582647d154238c5d5bc07ccf1d0fa869132