tree ddb004843c7c0331da0e20f9ab9e7fd3b19ced58
parent 0a7a8526464f191de0ad45f413318fa03627807b
parent da76169f5e75ccbfaafb86dfcd01228d0bed265a
author Dongwon Kang <dwkang@google.com> 1442335886 -0700
committer Dongwon Kang <dwkang@google.com> 1442335886 -0700

resolved conflicts for da76169f to lmp-dev

Change-Id: I8cbd874e6cc92bfff8406c8c5173b1dfc2624f4b