| commit | bc9c554abc4d17e0788be2cdc5321c9d865897ec | [log] [tgz] |
|---|---|---|
| author | Griff Hazen <griff@google.com> | Thu Apr 24 18:33:51 2014 -0700 |
| committer | Griff Hazen <griff@google.com> | Thu Apr 24 18:33:51 2014 -0700 |
| tree | f58feb03510d610474a3d65698e3336d68f7a6aa | |
| parent | ac7cd79494bd02a044c9df413d2a20aeebc696e8 [diff] | |
| parent | 7761fdd6f278b630120cdeb6dbf19aee6354a281 [diff] |
resolved conflicts for merge of 7761fdd6 to klp-modular-dev Change-Id: I78b478f9c1aafb92c730f2bbd4031c1cad7fbaff