| commit | 6c82a331e78e1347e0b2eeb830fca0abfb7c8900 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Fri May 23 16:08:28 2014 -0700 |
| committer | Jeff Brown <jeffbrown@google.com> | Fri May 23 16:09:01 2014 -0700 |
| tree | 28e55d09911b6b168a1b1f0b8d1bc1eb0e27d585 | |
| parent | 5932b6f9da84a3fe8f516699c2a853f83b937cfc [diff] | |
| parent | 16cc91f421181ae3cf6894136447bec4f7e59376 [diff] |
resolved conflicts for merge of 16cc91f4 to klp-modular-dev Change-Id: I5abcf9faad1c6504d588e0af54072ae45f60cb45