| commit | 493f73d8cddd82d1989e7a34f7c8e3f394da8ba0 | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Mon Aug 23 11:42:24 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Aug 23 11:42:24 2010 -0700 |
| tree | 793364f9b391f1b88ee318c2c97b4e8517d30bcf | |
| parent | 03053ceb83fdcf8fae9328e9dce69a17b1d244ee [diff] | |
| parent | 4106645061cc392339dce5d9d4b9b23727fba4b8 [diff] |
Merge "resolved conflicts for merge of a842d143 to master"