tree ce671481724fcc1cff2d15e047d23d7d742987fb
parent 72c8ca4a0191827fd3265c0820b685a6cf420be1
parent 834ac204ce52d874cdd7ae921e5a4d85c5e42c52
author Nick Kralevich <nnk@google.com> 1445559979 -0700
committer Nick Kralevich <nnk@google.com> 1445559988 -0700

resolve merge conflicts of 834ac204ce to klp-modular-dev.

Bug: 23905002
Change-Id: Ic7262861af91a8fff27692c0f68761cb3ab12aa3