| commit | 02a7a7a3ec7f817d2cc4da24cdece4fd8e5b0e99 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Sun Oct 10 11:57:00 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Sun Oct 10 11:58:25 2010 -0700 |
| tree | 0d4ae50aebab2bed2e5074c85a5083e118c589ab | |
| parent | c8241ca100cb2f806bab594bbb8c3120dc49e30e [diff] | |
| parent | 424de1779d54f979593c1d0924fc7890f82b0b33 [diff] |
manual merge of 424de177 Change-Id: Iaff23131e9c0ba4de2fc15600f940aa0d23c59fd