tree 7999571769c7a72999b2889fdf5054fa8667aaab
parent ba34c2ba414352ed0c1b9188f51c5445b04af2c6
parent c86eae32ebb0cc580a13dde30fe765a96b8e701c
author Nick Kralevich <nnk@google.com> 1439267094 -0700
committer Nick Kralevich <nnk@google.com> 1439267094 -0700

resolved conflicts for merge of c86eae32 to klp-modular-dev

Change-Id: I127912aed9c9e57a985c46bee13d111e159d2c6f