| commit | 0f06f2f89132fd7afbaec4683284df26a837cf21 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jan 28 09:57:00 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Jan 28 09:57:00 2010 -0800 |
| tree | 4bbd0b95124cdce4372d10f5d14b8c81447708f8 | |
| parent | ce47b4a5119bd799c907707642193a41e3ec9ba3 [diff] | |
| parent | 27b0373fc7fbed5b848096974df7d4ce1715cdf0 [diff] |
resolved conflicts for merge of 27b0373f to master Change-Id: I49fc5a1bf545814449f0c89c7a69ef75cf71d00c