tree ea88cf17dc96171ecd5ad872f426b869c4791a4f
parent 297b9d51a9a90ab6511ab405bb98f6fc98134289
parent bd5888b6e0c7bc2bb3d45f20e3e5f9a7bc0142e5
author Michael Kwan <mkwan@google.com> 1441287826 -0700
committer Michael Kwan <mkwan@google.com> 1441287826 -0700

resolved conflicts for merge of bd5888b6 to lmp-dev

Change-Id: I26a9fbac2d06b65e1c843f566443cb0b44d5a917