| commit | 2ff71ebbd9f6cf3fe0e95b2468f09cae76394a73 | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Tue Mar 18 14:44:37 2014 -0700 |
| committer | Mathieu Chartier <mathieuc@google.com> | Tue Mar 18 14:44:37 2014 -0700 |
| tree | 4ca521d7fcc0740d8a0ec8348f20ef400c0abfdc | |
| parent | 7379316700cab1863456ab8b0049058f34c2c569 [diff] | |
| parent | c0f96d03a1855fda7d94332331b94860404874dd [diff] |
resolved conflicts for merge of c0f96d03 to klp-modular-dev Change-Id: I824b7c48159c34147c0a101e7d699bb3cb13274a