| commit | 972bd08dff5f6adda7ba0995b7491cf9882ab6a8 | [log] [tgz] |
|---|---|---|
| author | Android (Google) Code Review <android-gerrit@google.com> | Mon Aug 17 19:21:49 2009 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Aug 17 19:21:49 2009 -0700 |
| tree | 6841d5b1d696e27f66c30ede34c73d30cf5cc5c3 | |
| parent | 4789a744fe0330863ad70cd3dad1bff98992c6a8 [diff] | |
| parent | ecc0defdd8b671328ba3ecaa9db38e84649924a2 [diff] |
Merge change 21655 into eclair * changes: resolved conflicts for merge of 696b912e to eclair