tree 1da355440ee94c89f052aefa3cb1ee44d0a1fcca
parent db7a0e7c3e2f2956aaad3cea76c1e71be8ca7ff2
parent e87f06177404a741596f65e8a0a5ed47578f23b1
author Michael Kwan <mkwan@google.com> 1441294799 -0700
committer Michael Kwan <mkwan@google.com> 1441310650 -0700

resolved conflicts for merge of e87f0617 to lmp-dev

Change-Id: I0388975f97443f1bcb729620637e878938ae09b8