| commit | dd86ed9b578332661ecea50e20f91335a0151a88 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Oct 29 14:58:16 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Oct 29 14:58:16 2013 -0700 |
| tree | 159ad9c9e4d992207f827ac6cdaa52532c6227ec | |
| parent | 887b4e89e713fd554e54f948fae52ddd7f8e03ca [diff] | |
| parent | ed84dea928a5a830a19b5bcab7ad05a7e92f3279 [diff] |
resolved conflicts for merge of ed84dea9 to master Change-Id: Id214389f321f07aadd7a25e454a07863d7b128cb