| commit | 8fa15689f1a4a6a55a01380b968ed34fed7d6357 | [log] [tgz] |
|---|---|---|
| author | Alexander Lucas <alexlucas@google.com> | Tue Mar 04 16:55:23 2014 -0800 |
| committer | Alexander Lucas <alexlucas@google.com> | Tue Mar 04 16:55:23 2014 -0800 |
| tree | 322d48e3a28793e9139927c473796acb26da2e12 | |
| parent | 7083e9e73b202a0c20c685b9fa19774b4bcbba3b [diff] | |
| parent | d6c248558a9175b17d126e35a47351fa9d54e628 [diff] |
resolved conflicts for merge of d6c24855 to klp-ub-dev Change-Id: Ib3085c2990ba15c1ccab4421a17c971bd38762b0