tree 9f0a5fe21a4b7c9c6d143affbe27294319795995
parent ec4b58ad8a21b511bf6b136792bb924eb6e9e299
parent 86a28d0aaf438f5fbf8c424dc7d2d30553f14bd5
author Matt Sarett <msarett@google.com> 1463687245 -0400
committer Matt Sarett <msarett@google.com> 1463687245 -0400

resolve merge conflicts of 86a28d0 to klp-modular-dev

Change-Id: Ic0b085e008155da3718dab8fd5a36be6d4059aee