| commit | 37e7e9e052570ea261ac2746bcb41fb907fc1b37 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Nov 22 16:32:34 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Nov 22 16:32:34 2010 -0800 |
| tree | d139737f456612500eda893c97e8576faee814f5 | |
| parent | 07db9276c09cb2becdeb95bde761494473e045ba [diff] | |
| parent | dba567c4ae9df9f0d8d021313b0280e6bd3d1bd8 [diff] |
resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aosp Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8