| commit | 5922b6238b59fd26cbd412b438cb54bba5463581 | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Sun Oct 10 18:45:23 2010 -0700 |
| committer | Gilles Debunne <debunne@google.com> | Sun Oct 10 18:45:23 2010 -0700 |
| tree | dea944ef79b5fba8dac214b522bd2f9a5623b054 | |
| parent | 1e8a65536d5caf52d0151031b32be4247da26391 [diff] | |
| parent | ecd641b891464bd16b236c2b63800cc25d92cb1b [diff] |
resolved conflicts for merge of d7d47941 to master Change-Id: I4ec47b9461c5ba350adfc257bc1820ee079b751e