| commit | 7a31d618a21997ee69ab3ec5888360c5db374e72 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Wed Sep 09 14:38:22 2015 -0700 |
| committer | Unsuk Jung <unsuk@google.com> | Wed Sep 09 14:39:17 2015 -0700 |
| tree | 7ec28934684ea5ee06302f5265c26dccae34d567 | |
| parent | 304364ee304efa870237ec521b4099950abc386a [diff] | |
| parent | 196e6710adadc00bb97e5b3381b1fff4e4db2ab8 [diff] |
resolved conflicts for merge of 196e6710 to klp-modular-dev Change-Id: I597ff01d6404d7ecddf15ce9b24e1cd8cc752125