| commit | 797e4f1087e408060f2812c79bddcd2b73a3830d | [log] [tgz] |
|---|---|---|
| author | Nicolas Roard <nicolas@android.com> | Mon Jan 04 20:25:48 2010 +0000 |
| committer | Nicolas Roard <nicolas@android.com> | Mon Jan 04 20:25:48 2010 +0000 |
| tree | 988271e6c693cf3127a7ce0b5a16a2dcc7e61211 | |
| parent | e035b64a686cf87a82d880d4863856231625b2f8 [diff] |
resolved conflicts for merge of 870689c8