| commit | 0ed3f5dead10439afa1e68829adbcbc6cf82d312 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Oct 12 09:23:10 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Oct 12 09:23:10 2010 -0700 |
| tree | bbeae420ec98053e41679976162a1e179ec4482b | |
| parent | 52ebb2e4b413bc64d80f3321654380a9932df71b [diff] | |
| parent | 0ace3f4b92aa2d98341e5708835f7c9af0837af5 [diff] |
resolved conflicts for merge of e69f1f1a to master Change-Id: I32b34e4f6ae83ff40398c6e9e2881af12abc4aa8