| commit | fae59e8ae129ec41faed029cfa09df8856b7d21c | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Nov 05 13:15:10 2013 -0800 |
| committer | Scott Main <smain@google.com> | Tue Nov 05 13:15:10 2013 -0800 |
| tree | afa9f04e5d8df1b3684e52cdcfdc6bc7a37ff6c3 | |
| parent | d7f2d1ca07b92cf333955f19e839f0b3dc30f9ff [diff] | |
| parent | 1d38e9a13e5e90e6ec5fe6c3582a9b0472f39867 [diff] |
resolved conflicts for merge of 1d38e9a1 to klp-ub-dev Change-Id: I4f74db2ae175c2405aacece146244928f436551c