| commit | f7f27a15b3ef8214fb77611ae3eeeaf53125315e | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Sun Oct 10 13:55:49 2010 -0700 |
| committer | Gilles Debunne <debunne@google.com> | Sun Oct 10 13:55:49 2010 -0700 |
| tree | 11ab336c37c0f62ee9e73d210f7a267cc140687f | |
| parent | 41cc056619b25b1fc8e01ef36634b4b50b1f3823 [diff] | |
| parent | f5c77459fa992998345c93c2777c4390b9edc122 [diff] |
resolved conflicts for merge of bd38710b to master Change-Id: I3489b6909ce2a215318d45f809b82579503fd733