| commit | 7d667fb5c91de132a271f854302f824702fbb3d4 | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Thu Sep 30 11:55:39 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 30 11:55:39 2010 -0700 |
| tree | fec9765eff7270c33e9a84f91aa5b40beb85ccf0 | |
| parent | 20e987bfc35d0ae6cb6344ead65ed44ee7cf8750 [diff] | |
| parent | 09f161288568b842b07b0c10160a0c5480f6ed31 [diff] |
Merge "resolved conflicts for merge of 8064dd22 to master"