| commit | 6d4d8cb79c5578d33ab17806d67b1e53a730fbc3 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 23 13:53:19 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 23 13:53:19 2010 -0700 |
| tree | 9642a50962a867b9cf1a37a53e7485bfad00f256 | |
| parent | 4e69dfed0b0fe672e366bb84d5c3feaedc61d630 [diff] | |
| parent | 4f086aeb4aa06e13079b7fec71a8178ceeacf318 [diff] |
resolved conflicts for merge of 4f086aeb to gingerbread-plus-aosp Change-Id: Ice2a6d41a7e9d04eca02e15ed189d648d61b5801