| commit | 9c9430b30f31713971d8f9f53df9588a3ba01340 | [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 | 82245956f7a820db650b616a77f4c56c99efb270 | |
| parent | 5684d464c09bdb50fb11889eb787a08556c2bb70 [diff] | |
| parent | e69f1f1a748da99c82bcb56f6c7107a5618ba906 [diff] |
resolved conflicts for merge of e69f1f1a to master Change-Id: I32b34e4f6ae83ff40398c6e9e2881af12abc4aa8