| commit | 335a8a6c08abfbea29dead003b4fa95fca786ccd | [log] [tgz] |
|---|---|---|
| author | Matthew Xie <mattx@google.com> | Mon Mar 24 12:37:40 2014 -0700 |
| committer | Matthew Xie <mattx@google.com> | Mon Mar 24 12:37:40 2014 -0700 |
| tree | 2a3a9de303392f01a8bc2c5d5c0dceb567b8ca0a | |
| parent | 6746717209435aac27eedeebdf67da1a1fbc5e5a [diff] | |
| parent | f4471c7e6ca7a0bd4846b2fe4fbe78d79ef37b81 [diff] |
resolved conflicts for merge of f4471c7e to klp-modular-dev Change-Id: I89ce6df8f59efa8cee63775eff58262ecf438db3