| commit | 9580b8ce6553ddde03db594fd4fd4f59ca61c382 | [log] [tgz] |
|---|---|---|
| author | Gloria Wang <gwang@google.com> | Thu Oct 07 15:27:17 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Oct 07 15:27:17 2010 -0700 |
| tree | bac634abd9cb09389028cbc9c3c2d80adbb7f3d2 | |
| parent | bb70837397e3fb437b7b4443b37d7a83c11e6e43 [diff] | |
| parent | e6ad0e477b5d4326487059e5d6c4697f97accbd1 [diff] |
resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp Change-Id: I63b00932b0f8b975da31aa9a010369db2d49fd76