| commit | a2a5de35c38613e60d0df784c9dcd7f08e6e463e | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Mon Nov 04 19:13:30 2013 -0800 |
| committer | Dirk Dougherty <ddougherty@google.com> | Mon Nov 04 19:15:29 2013 -0800 |
| tree | 0af7a83c782b13d1681a271a6da01e251e9cca0e | |
| parent | 4e4303c993ef50d45e5d6b783d9c127b4d3857b1 [diff] | |
| parent | 3ef2b0f3711df9249ea48ac9cd4b08e663d45f18 [diff] |
resolved conflicts for merge of 3ef2b0f3 to klp-ub-dev Change-Id: I12241f15975deb12f0183e4fcda1541bc40f66da