| commit | ff5e2fddb39e2220e3a7a773116dc66f1c85e5c4 | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Mon Oct 04 16:01:22 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 04 16:01:22 2010 -0700 |
| tree | c7f57a471ef7a293ba101955c412b9d2376d3908 | |
| parent | 5110891a53c9e4b553a843870bb5cece36b8ed21 [diff] | |
| parent | ad54820fff5eaa12591790fa576d6845513fc51e [diff] |
Merge "resolved conflicts for merge of 242fa52b to master"