| commit | 925f2f909649dd0cbf93674201430879c2e03f99 | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Tue Aug 24 15:11:30 2010 -0700 |
| committer | Gilles Debunne <debunne@google.com> | Tue Aug 24 15:14:12 2010 -0700 |
| tree | b747e4bc6aeb84afee9102faaf23577ee0879068 | |
| parent | 0e30200ed112388110c33fdf3fa6fa0e6d2b953a [diff] | |
| parent | 9765b2a01d32ea6f2f955170ef7d0185e2252b0a [diff] |
resolved conflicts for merge of 9765b2a0 to master Change-Id: Ic37a443fff0425e9d7c8395f71665d56c38d7e53