| commit | a4ddf42673f62945278f89747fbeab07a61784f1 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 24 10:45:16 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 24 10:45:16 2010 -0700 |
| tree | 9aca1010ce235e18bac08059ee84753c1dc7272e | |
| parent | 0a5699654f33fc41a9baed26abb9b867ba439399 [diff] | |
| parent | c64b916ef56f5713bc1f7c3e496fdea9a846daf5 [diff] |
resolved conflicts for merge of c64b916e to master Change-Id: I31b84d72186a918f19e0c9dee8fdebc83f661cc1