| commit | 5a98ec046c555b02d2f306efc117f7dafd32fc7d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Oct 19 15:19:45 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Oct 19 15:19:45 2010 -0700 |
| tree | 84416e382b9711d3c8e5203940bfefdfde20e080 | |
| parent | b9e0af8e059121eac4b7cedba2c0679088bc2466 [diff] | |
| parent | 54ddcc2724b0e1ab790d00eb9435a493da07aa03 [diff] |
resolved conflicts for merge of 54ddcc27 to gingerbread-plus-aosp Change-Id: I336f9e6859dce3bb18224b3340837474319c809c