| commit | a7dda98df7ab61b9a7ed93aace480cd5e90f7f10 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Nov 17 16:52:55 2010 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 17 16:52:56 2010 -0800 |
| tree | 1a3c683f8da28300d3c93bea95b96290d9e30dbe | |
| parent | a25a6835e708014632b9bea444a9c7f980bfd13b [diff] | |
| parent | 8ff8a2d0299e7292b71d679069c41b84f7fe86b8 [diff] |
Merge "resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp" into gingerbread-plus-aosp