| commit | ddbcce3afbb38680fb84583f7bad5209307e6459 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 17 09:05:27 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 17 09:05:27 2010 -0700 |
| tree | 4634ceed75d8801956744e463534a2c97f8b7e12 | |
| parent | ab59914de7ac714d04a5013c53aa9c7edb5421a2 [diff] | |
| parent | 6525fca692c57f9746ab65535d3b2f7ec712113c [diff] |
Merge "resolved conflicts for merge of be50507b to gingerbread-plus-aosp" into gingerbread-plus-aosp