| commit | 18ec7c4f8a8d1780fa80f0ab21e484576c775fe4 | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Fri Aug 22 11:26:33 2014 -0700 |
| committer | Raphael Moll <raphael@google.com> | Fri Aug 22 11:26:33 2014 -0700 |
| tree | ca3b9770cac2aaabee7979994b6dbf96a24f9bc4 | |
| parent | d97ecae3db7b06238e215f6cde15b1bfee658a02 [diff] | |
| parent | 566a46941e4b473fb4fd2e74a18b7453ebad1625 [diff] |
resolved conflicts for merge of 566a4694 to klp-modular-dev Change-Id: I04c6c2fdff66e5e82f5f99cc629f9eaa5725ef26