| commit | 91a359e0d1f1ca7318a115b258ce67b107d96821 | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Sun Oct 10 14:00:43 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sun Oct 10 14:00:43 2010 -0700 |
| tree | ee5a91a44a2498ca9dc92161c778a2721b35fd6f | |
| parent | cde08e339ecaff5847038cd8c97e7095d24aa1db [diff] | |
| parent | a89af70cdcc3ace1d1d641fa302c6162f4132339 [diff] |
Merge "resolved conflicts for merge of bd38710b to master"