| commit | ecff92d9f7d58b619465259213d7a58ae01c2872 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Dec 10 14:04:30 2013 -0800 |
| committer | Scott Main <smain@google.com> | Tue Dec 10 14:04:30 2013 -0800 |
| tree | ad522e74d9622726d2ac534bc60dc2c94f206426 | |
| parent | ea64d5de02842233b3a163c9c707cc77ce06483c [diff] | |
| parent | 79a55d358563ca7414902603653f39464991d000 [diff] |
resolved conflicts for merge of 79a55d35 to klp-ub-dev Change-Id: I95f46942e03f125e1a907003520caaf6ab575016