| commit | 94f8150be2041f73c2f185f2c3622a9537d47454 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Mon Aug 10 21:24:54 2015 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Mon Aug 10 21:24:54 2015 -0700 |
| tree | 7999571769c7a72999b2889fdf5054fa8667aaab | |
| parent | ba34c2ba414352ed0c1b9188f51c5445b04af2c6 [diff] | |
| parent | c86eae32ebb0cc580a13dde30fe765a96b8e701c [diff] |
resolved conflicts for merge of c86eae32 to klp-modular-dev Change-Id: I127912aed9c9e57a985c46bee13d111e159d2c6f