| commit | ceb931dcf2715c55ba3bd1b5d80254f654c217b7 | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Fri Oct 08 09:20:57 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Oct 08 09:20:57 2010 -0700 |
| tree | 8d8c8b31eb975d7399055448629ec0c0517c7190 | |
| parent | 028d06215e1354cb66d69cf85c313830ec92ba09 [diff] | |
| parent | 8c2f7216391948476406a006c29b6286e50dc44e [diff] |
Merge "resolved conflicts for merge of ba04dbc6 to master"