| commit | fc2563ba4e9c93ed803f3ce540f92f199f848036 | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Thu Aug 26 14:48:48 2010 -0700 |
| committer | Gilles Debunne <debunne@google.com> | Thu Aug 26 14:48:48 2010 -0700 |
| tree | a2157a6c4678af10aa28115edf16d4f030475d1e | |
| parent | c70bd1921bbc4046d0caf84959e5f1c2d526769a [diff] | |
| parent | f309c7a869b968465619077c78922cf3f95a629d [diff] |
resolved conflicts for merge of f309c7a8 to master Change-Id: I80dfe8a0b142fa95fa83d46f3b60223c2991fce3