| commit | 17c73b378c72d3d311c96973200022e4bec4686b | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Mon Oct 11 10:37:51 2010 -0700 |
| committer | Gilles Debunne <debunne@google.com> | Mon Oct 11 10:37:51 2010 -0700 |
| tree | dea944ef79b5fba8dac214b522bd2f9a5623b054 | |
| parent | eac429b16a798028240f3da6228da655a4670c38 [diff] | |
| parent | 3f6f10e9570454a63aa144abca44a4e155195f7d [diff] |
resolved conflicts for merge of 2da9338c to master Change-Id: I190aed34c356d26142dfa355adbdb9c7ff22a4af